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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index c0c89a7..6e1d237 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -23,7 +23,7 @@ sub handler {
 	}
 
 	# Internal? (Ugly?) 
-	if ($r->get_server_name =~ /internal/) {
+	if ($r->get_server_name =~ /internal/ || $r->get_server_name =~ /skoyen\.bilder\.knatten\.com/) {
 		my $user = Sesse::pr0n::Common::check_access($r);
 		if (!defined($user)) {
 			return Apache2::Const::OK;
@@ -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);
@@ -92,7 +98,7 @@ sub handler {
 	my $q;
 	my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
 
-	if (defined($start) && defined($num)) {
+	if (defined($start) && defined($num) && !$settings{'fullscreen'}) {
 		$q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename LIMIT $num OFFSET " . ($start-1))
 			or dberror($r, "prepare()");
 	} else {
@@ -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;
@@ -116,11 +122,15 @@ sub handler {
 		my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
 			Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
 
+		# *whistle*
+		$returnurl =~ s/&/&/g;
+
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
 			vhost => $r->get_server_name,
 			event => $event,
 			start => $settings{'start'} - 1,
-			returnurl => $returnurl
+			returnurl => $returnurl,
+			sel => $settings{'sel'},
 		});
 	} else {
 		Sesse::pr0n::Common::header($r, "$name [$event]");
@@ -136,6 +146,7 @@ sub handler {
 		print_infobox($r, $event, \%settings, \%defsettings);
 		print_nextprev($r, $event, \%settings, \%defsettings);
 		print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
+		print_fullscreen($r, $event, \%settings, \%defsettings);
 
 		my $toclose = 0;
 		my $lastupl = "";
@@ -164,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) {
@@ -207,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) {
@@ -245,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) {
@@ -432,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
@@ -450,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");
@@ -485,6 +498,19 @@ sub print_selected {
 	
 	$r->print('</p>');
 }
+
+sub print_fullscreen {
+	my ($r, $event, $settings, $defsettings) = @_;
+
+	chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen'));
+
+	my %newsettings = %$settings;
+	$newsettings{'fullscreen'} = 1;
+
+        $r->print("    <p>");
+	Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
+	$r->print("</p>\n");
+}
 	
 1;