X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=1be7b9e63e2a1ccf436519561005f5281432c2eb;hb=8659566dfd0c4a181b4562bc171a8f7df933668f;hp=fc8be72207a93c45e067bf217f3551ebb6175cf7;hpb=c53dd5ce79ebfdcf01c3847149611ebafcebdd69;p=pr0n

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index fc8be72..1be7b9e 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -58,13 +58,13 @@ sub handler {
 	
 	my $where;
 	if ($event eq '+all') {
-		$where = '';
+		$where = ' AND (event,vhost) IN ( SELECT event,vhost FROM events WHERE NOT hidden )';
 	} else {
 		$where = ' AND event=' . $dbh->quote($event);
 	}
 	
-	# Any NEF files => default to processing
-	my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1",
+	# Any NEF files with no non-NEF renders => default to processing
+	my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) AND render_id IS NULL LIMIT 1",
 		undef, Sesse::pr0n::Common::get_server_name($r))
 		and $defsettings{'xres'} = $defsettings{'yres'} = undef;
 	
@@ -122,9 +122,8 @@ sub handler {
 		}
 	}
 	if (defined($author)) {
-		my $aq = $dbh->quote($author);
-
-		$where .= " AND takenby=$aq";
+		my @authors = split /,/, $author;
+		$where .= " AND takenby IN (" . join(', ', map { $dbh->quote($_) } @authors) . ")";
 	}
 
 	if (defined($num) && $num == -1) {
@@ -156,13 +155,13 @@ sub handler {
 	# }
 	
 	# Count the number of selected images.
-	$ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected=\'t\'", undef, Sesse::pr0n::Common::get_server_name($r));
+	$ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected AND NOT is_render", undef, Sesse::pr0n::Common::get_server_name($r));
 	my $num_selected = $ref->{'num_selected'};
 
 	# Find all images related to this event.
 	my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-	my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit")
+	my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where AND NOT is_render ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit")
 		or return dberror($r, "prepare()");
 	$q->execute(Sesse::pr0n::Common::get_server_name($r))
 		or return dberror($r, "image enumeration");
@@ -212,7 +211,6 @@ sub handler {
 			Sesse::pr0n::Templates::print_template($r, $io, "overloadmode");
 		}
 
-		print_viewres($r, $io, $event, \%settings, \%defsettings);
 		print_selected($r, $io, $event, \%settings, \%defsettings) if ($num_selected > 0);
 		print_fullscreen($r, $io, $event, \%settings, \%defsettings);
 		print_nextprev($r, $io, $event, $where, \%settings, \%defsettings);
@@ -226,6 +224,7 @@ sub handler {
 					COUNT(*) AS num
 				FROM images
 				WHERE vhost=? $where
+				AND NOT is_render
 				GROUP BY 1,2
 				ORDER BY 1,2")
 				or die "Couldn't prepare to find equipment: $!";
@@ -341,6 +340,12 @@ sub handler {
 				$imgsz = " width=\"$width\" height=\"$height\"";
 			}
 
+			# Add fullscreen link.
+			my %fssettings = %settings;
+			$fssettings{'fullscreen'} = 1;
+			my $fsquery = Sesse::pr0n::Common::get_query_string(\%fssettings, \%defsettings);
+			$fsquery .= '#' . $img_num;
+
 			my $filename = $ref->{'filename'};
 			my $uri = $filename;
 			if (defined($xres) && defined($yres) && $xres != -1 && $xres != -2) {
@@ -359,7 +364,7 @@ sub handler {
 			} else {
 				$io->print("     ");
 			}
-			$io->print("<a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+			$io->print("<a href=\"$prefix$uri\" id=\"$img_num\" onclick=\"location.href='$prefix$fsquery';return false;\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
 		
 			if ($rot == 1) {
 				$io->print("      90 <input type=\"checkbox\" name=\"rot-" .
@@ -440,18 +445,6 @@ sub print_changes {
 	$io->print("    </p>\n");
 }
 
-sub print_viewres {
-	my ($r, $io, $event, $settings, $defsettings) = @_;
-	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536 2304x1728);
-	chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited'));
-	chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original'));
-	push @alternatives, [ $unlimited, -2, -2 ];
-	push @alternatives, [ $original, -1, -1 ];
-
-	print_changes($r, $io, $event, 'viewres', $settings, $defsettings,
-		      'xres', 'yres', \@alternatives);
-}
-
 sub print_nextprev {
 	my ($r, $io, $event, $where, $settings, $defsettings) = @_;
 	my $start = $settings->{'start'};
@@ -462,7 +455,7 @@ sub print_nextprev {
 	return unless (defined($start) && defined($num));
 
 	# determine total number
-	my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where",
+	my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where AND NOT is_render",
 		undef, Sesse::pr0n::Common::get_server_name($r))
 		or return dberror($r, "image enumeration");
 	my $num_images = $ref->{'num_images'};