X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=6e1d237ce4640a4fbac9e5c794d5cb0cc1940b03;hp=bf201acab472241574e7d3427bcb5b530a16a44d;hb=8ef0c7592d5597750ae272bd2b4e19551b1432db;hpb=b40e22b518a248aca5bf453fe55aa81534dd648f

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index bf201ac..6e1d237 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -77,12 +77,18 @@ sub handler {
 		$num = undef;
 	}
 
-	my $ref = $dbh->selectrow_hashref('SELECT * FROM events WHERE id=? AND vhost=?',
+	my $ref = $dbh->selectrow_hashref('SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE id=? AND vhost=?',
 		undef, $event, $r->get_server_name)
 		or error($r, "Could not find event $event", 404, "File not found");
 
 	my $name = $ref->{'name'};
 	my $date = $ref->{'date'};
+	$r->set_last_modified($ref->{'last_update'});
+		                
+	# If the client can use cache, do so
+	if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
+		return $rc;
+	}
 	
 	# Count the number of selected images.
 	$ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE event=? AND selected=\'t\'", undef, $event);
@@ -107,7 +113,7 @@ sub handler {
 		$r->content_type("text/html; charset=utf-8");
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
 		while (my $ref = $q->fetchrow_hashref()) {
-			$r->print("        \"" . $ref->{'filename'} . "\",\n");
+			$r->print("        \"" . $infobox . $ref->{'filename'} . "\",\n");
 		}
 
 		my %settings_no_fullscreen = %settings;
@@ -169,7 +175,7 @@ sub handler {
 				}
 
 				my $filename = $ref->{'filename'};
-				my $uri = $filename;
+				my $uri = $infobox . $filename;
 				if (defined($xres) && defined($yres) && $xres != -1) {
 					$uri = "${xres}x$yres/$infobox$filename";
 				} elsif (defined($xres) && $xres == -1) {
@@ -212,7 +218,7 @@ sub handler {
 				}
 
 				my $filename = $ref->{'filename'};
-				my $uri = $filename;
+				my $uri = $infobox . $filename;
 				if (defined($xres) && defined($yres) && $xres != -1) {
 					$uri = "${xres}x$yres/$infobox$filename";
 				} elsif (defined($xres) && $xres == -1) {
@@ -250,7 +256,7 @@ sub handler {
 				}
 
 				my $filename = $ref->{'filename'};
-				my $uri = $filename;
+				my $uri = $infobox . $filename;
 				if (defined($xres) && defined($yres) && $xres != -1) {
 					$uri = "${xres}x$yres/$infobox$filename";
 				} elsif (defined($xres) && $xres == -1) {
@@ -437,7 +443,8 @@ sub print_nextprev {
 		my %newsettings = %$settings;
 		$newsettings{'start'} = $newstart;
 		chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'prevpage'));
-		Sesse::pr0n::Common::print_link($r, "$title ($newstart-$newend)\n", "/$event/", \%newsettings, $defsettings);
+		chomp (my $accesskey = Sesse::pr0n::Templates::fetch_template($r, 'prevaccesskey'));
+		Sesse::pr0n::Common::print_link($r, "$title ($newstart-$newend)\n", "/$event/", \%newsettings, $defsettings, $accesskey);
 	}
 
 	# This
@@ -455,7 +462,8 @@ sub print_nextprev {
 		my %newsettings = %$settings;
 		$newsettings{'start'} = $newstart;
 		chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'nextpage'));
-		Sesse::pr0n::Common::print_link($r, "$title ($newstart-$newend)", "/$event/", \%newsettings, $defsettings);
+		chomp (my $accesskey = Sesse::pr0n::Templates::fetch_template($r, 'nextaccesskey'));
+		Sesse::pr0n::Common::print_link($r, "$title ($newstart-$newend)", "/$event/", \%newsettings, $defsettings, $accesskey);
 	}
 
 	$r->print("    </p>\n");