X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FListing.pm;h=c8f93f249fae58c2ef8ba34ea9c093bf7e58eb5e;hp=d344083a0518225fcbaf36c8ce4430b0cc89577b;hb=29d3bea6754640ffe4ed735caafa7f497623142d;hpb=2eb22a8cf072d004c98fbdafaba2d7f1b6801f50

diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm
index d344083..c8f93f2 100644
--- a/perl/Sesse/pr0n/Listing.pm
+++ b/perl/Sesse/pr0n/Listing.pm
@@ -24,9 +24,9 @@ sub handler {
 	}
 	
 	# find the last modification
-	my $ref = $dbh->selectrow_hashref('SELECT EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? ORDER BY last_update DESC LIMIT 1',
+	my $ref = $dbh->selectrow_hashref('SELECT EXTRACT(EPOCH FROM last_update) AS last_update FROM last_picture_cache WHERE vhost=? ORDER BY last_update DESC LIMIT 1',
 		undef, $r->get_server_name)
-		or error($r, "Could not any events", 404, "File not found");
+		or error($r, "Could not find any events", 404, "File not found");
 	$r->set_last_modified($ref->{'last_update'});
 	$r->content_type('text/html; charset=utf-8');
 		                
@@ -43,11 +43,12 @@ sub handler {
 			or dberror($r, "Couldn't get events");
 		
 		Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'tag-listing'));
+		Sesse::pr0n::Templates::print_template($r, 'mainmenu-tags');
 
 		my $cloud = HTML::TagCloud->new;
 
 		while (my $ref = $q->fetchrow_hashref()) {
-			my $tag = Encode::decode_utf8($ref->{'tag'});
+			my $tag = $ref->{'tag'};
 			my $html = HTML::Entities::encode_entities($tag);    # is this right?
 			my $uri = Sesse::pr0n::Common::pretty_escape($tag);  # and this?
 
@@ -62,12 +63,20 @@ sub handler {
 		# main listing
 #		my $q = $dbh->prepare('SELECT t1.id,t1.date,t1.name FROM events t1 LEFT JOIN images t2 ON t1.id=t2.event WHERE t1.vhost=? GROUP BY t1.id,t1.date,t1.name ORDER BY COALESCE(MAX(t2.date),\'1970-01-01 00:00:00\'),t1.id') or
 #			dberror($r, "Couldn't list events");
-		my $q = $dbh->prepare('SELECT event,date,name FROM events e JOIN last_picture_cache c USING (vhost,event) WHERE vhost=? ORDER BY last_picture DESC')
+		my $q = $dbh->prepare('SELECT event,date,name FROM events e JOIN last_picture_cache c USING (vhost,event) WHERE vhost=? ORDER BY last_picture DESC NULLS LAST')
 			or dberror($r, "Couldn't list events");
 		$q->execute($r->get_server_name)
 			or dberror($r, "Couldn't get events");
 		
 		Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
+
+		# See if there are any tags related to this vhost
+		my $ref = $dbh->selectrow_hashref('SELECT * FROM tags t JOIN images i ON t.image=i.id WHERE vhost=? LIMIT 1',
+			undef, $r->get_server_name);
+		if (defined($ref)) {
+			Sesse::pr0n::Templates::print_template($r, 'mainmenu-events');
+		}
+
 		my $allcaption = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
 		$r->print("    <ul>\n");
 		$r->print("      <li><a href=\"+all/\">$allcaption</a></li>\n");
@@ -77,8 +86,8 @@ sub handler {
 
 		while (my $ref = $q->fetchrow_hashref()) {
 			my $id = $ref->{'event'};
-			my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
-			my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
+			my $date = HTML::Entities::encode_entities($ref->{'date'});
+			my $name = HTML::Entities::encode_entities($ref->{'name'});
 			
 			$r->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
 		}