X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=88e0e49339311096ae02bc6ae7af355aa4957cea;hp=5a635d4c190aac8a5fff7e9fc3a05c1ae4aa25b8;hb=c8fb633d012a9078990d0abc28cdd527d1362e4a;hpb=6b6a6afa90a6be24ae430324ec5ca7fd83f4fe93 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 5a635d4..88e0e49 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/ || $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; @@ -46,8 +46,8 @@ sub handler { ); # Any NEF files => default to processing - my $ref = $dbh->selectrow_hashref('SELECT * FROM images WHERE event=? AND LOWER(filename) LIKE \'%.nef\' LIMIT 1', - undef, $event) + my $ref = $dbh->selectrow_hashref('SELECT * FROM images WHERE event=? AND vhost=? AND LOWER(filename) LIKE \'%.nef\' LIMIT 1', + undef, $event, $r->get_server_name) and $defsettings{'xres'} = $defsettings{'yres'} = undef; # Reduce the front page load when in overload mode. @@ -82,7 +82,7 @@ sub handler { $num = undef; } - $ref = $dbh->selectrow_hashref('SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE id=? AND vhost=?', + $ref = $dbh->selectrow_hashref('SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE event=? AND vhost=?', undef, $event, $r->get_server_name) or error($r, "Could not find event $event", 404, "File not found"); @@ -96,21 +96,16 @@ sub handler { } # Count the number of selected images. - $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE event=? AND selected=\'t\'", undef, $event); + $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE event=? AND vhost=? AND selected=\'t\'", undef, $event, $r->get_server_name); my $num_selected = $ref->{'num_selected'}; # Find all images related to this event. - my $q; my $where = ($all == 0) ? ' AND selected=\'t\'' : ''; + my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : ""; - 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 { - $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") - or dberror($r, "prepare()"); - } - $q->execute($event) + my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? AND vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit") + or dberror($r, "prepare()"); + $q->execute($event, $r->get_server_name) or dberror($r, "image enumeration"); # Print the page itself @@ -149,25 +144,25 @@ sub handler { print_viewres($r, $event, \%settings, \%defsettings); print_pagelimit($r, $event, \%settings, \%defsettings); 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); + print_nextprev($r, $event, \%settings, \%defsettings); # Find the equipment used - my $eq = $dbh->prepare(' + my $eq = $dbh->prepare(" SELECT TRIM(model.value) AS model, coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens, COUNT(*) AS num - FROM images i + FROM ( SELECT * FROM images WHERE event=? AND vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit ) i LEFT JOIN exif_info model ON i.id=model.image - LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'Lens\' ) lens ON i.id=lens.image - LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'LensSpec\') lens_spec ON i.id=lens_spec.image - WHERE event=? AND model.tag=\'Model\' + LEFT JOIN ( SELECT * FROM exif_info WHERE tag='Lens' ) lens ON i.id=lens.image + LEFT JOIN ( SELECT * FROM exif_info WHERE tag='LensSpec') lens_spec ON i.id=lens_spec.image + WHERE model.tag='Model' GROUP BY 1,2 - ORDER BY 1,2') + ORDER BY 1,2") or die "Couldn't prepare to find equipment: $!"; - $eq->execute($event) + $eq->execute($event, $r->get_server_name) or die "Couldn't find equipment: $!"; my @equipment = (); @@ -206,12 +201,13 @@ sub handler { my $toclose = 0; my $lastupl = ""; + my $img_num = (defined($start) && defined($num)) ? $start : 1; # Print out all thumbnails if ($rot == 1) { $r->print("
\n"); $r->print(" \n"); - + while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; my $takenby = $ref->{'takenby'}; @@ -221,7 +217,10 @@ sub handler { if ($takenby ne $lastupl) { $lastupl = $takenby; + $r->print("

"); Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); + print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); + $r->print("

\n"); } if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { my $width = $ref->{'width'}; @@ -248,48 +247,11 @@ sub handler { $ref->{'id'} . "-270\" />\n"); $r->print("        " . "     Del {'id'} . "\" />

\n"); + + ++$img_num; } $r->print(" \n"); $r->print("
\n"); - } elsif ($sel == 1) { - $r->print("
\n"); - $r->print(" \n"); - - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; - } - - if ($takenby ne $lastupl) { - $lastupl = $takenby; - Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); - } - if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { - my $width = $ref->{'width'}; - my $height = $ref->{'height'}; - - ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres); - $imgsz = " width=\"$width\" height=\"$height\""; - } - - my $filename = $ref->{'filename'}; - my $uri = $infobox . $filename; - if (defined($xres) && defined($yres) && $xres != -1) { - $uri = "${xres}x$yres/$infobox$filename"; - } elsif (defined($xres) && $xres == -1) { - $uri = "original/$infobox$filename"; - } - - my $selected = $ref->{'selected'} ? ' checked="checked"' : ''; - - $r->print("

\"\"$imgsz\n"); - $r->print(" {'id'} . "\"$selected />

\n"); - } - $r->print(" \n"); - $r->print("
\n"); } else { while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; @@ -301,8 +263,11 @@ sub handler { if ($takenby ne $lastupl) { $r->print("

\n\n") if ($lastupl ne ""); $lastupl = $takenby; + $r->print("

"); Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl }); - $r->print("

\n"); + print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num); + $r->print("

\n"); + $r->print("

\n"); } if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { my $width = $ref->{'width'}; @@ -321,6 +286,8 @@ sub handler { } $r->print(" \"\"$imgsz\n"); + + ++$img_num; } $r->print("

\n"); } @@ -466,14 +433,16 @@ sub print_nextprev { my ($r, $event, $settings, $defsettings) = @_; my $start = $settings->{'start'}; my $num = $settings->{'num'}; + my $all = $settings->{'all'}; my $dbh = Sesse::pr0n::Common::get_dbh(); + my $where = ($all == 0) ? ' AND selected=\'t\'' : ''; $num = undef if (defined($num) && $num == -1); return unless (defined($start) && defined($num)); # determine total number - my $ref = $dbh->selectrow_hashref('SELECT count(*) AS num_images FROM images WHERE event=?', - undef, $event) + my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE event=? AND vhost=? $where", + undef, $event, $r->get_server_name) or dberror($r, "image enumeration"); my $num_images = $ref->{'num_images'}; @@ -484,7 +453,7 @@ sub print_nextprev { $end = $num_images; } - $r->print("

\n"); + $r->print("

\n"); # Previous if ($start > 1) { @@ -568,6 +537,20 @@ sub print_fullscreen { Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); $r->print("

\n"); } + +sub print_fullscreen_fromhere { + my ($r, $event, $settings, $defsettings, $start) = @_; + + chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen-fromhere')); + + my %newsettings = %$settings; + $newsettings{'fullscreen'} = 1; + $newsettings{'start'} = $start; + + $r->print("

"); + Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); + $r->print("

\n"); +} 1;