X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FListing.pm;h=6f47355f4596631f9d20693dc48c48d5ba8c961a;hp=473914e1fdb63fed53c6edd28898fbd2513c7bac;hb=fa10473159be03eb924e50cdb4688540c78f89b1;hpb=6b5bd71a7aaf4946ab698ed56bddcb83ebdbc7ca

diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm
index 473914e..6f47355 100644
--- a/perl/Sesse/pr0n/Listing.pm
+++ b/perl/Sesse/pr0n/Listing.pm
@@ -9,27 +9,42 @@ sub handler {
 	my $dbh = Sesse::pr0n::Common::get_dbh();
 
         # Internal? (Ugly?)
-	if ($r->get_server_name =~ /internal/ || $r->get_server_name =~ /skoyen\.bilder\.knatten\.com/) {
+	if ($r->get_server_name =~ /internal/ || $r->get_server_name =~ /skoyen\.bilder\.knatten\.com/ || $r->get_server_name =~ /lia\.heimdal\.org/) {
 		my $user = Sesse::pr0n::Common::check_access($r);
 		if (!defined($user)) {
 			return Apache2::Const::OK;
 		}
 	}
+	
+	# 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',
+		undef, $r->get_server_name)
+		or error($r, "Could not any events", 404, "File not found");
+	$r->set_last_modified($ref->{'last_update'});
+	$r->content_type('text/html; charset=utf-8');
+		                
+	# If the client can use cache, do so
+	if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
+		return $rc;
+	}
 
 #	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 id,date,name FROM events e JOIN last_picture_cache c ON e.id=c.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')
 		or dberror($r, "Couldn't list events");
 	$q->execute($r->get_server_name)
 		or dberror($r, "Couldn't get events");
-
-	$r->content_type('text/html; charset=utf-8');
-
+	
 	Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
+	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");
+	$r->print("    </ul>\n");
+	
 	$r->print("    <ul>\n");
 
 	while (my $ref = $q->fetchrow_hashref()) {
-		my $id = $ref->{'id'};
+		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'}));