X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=849870f4ec8e8add783689ce96967823eb0d0804;hp=178245369e346eb6e6bdeeb758899a778ed46db6;hb=fddc182ea1420b4dd630bdfde6c49d79f3ba51b3;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 1782453..849870f 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; @@ -34,16 +34,22 @@ sub handler { my %defsettings = ( thumbxres => 80, thumbyres => 64, - xres => undef, - yres => undef, + xres => -1, + yres => -1, start => 1, num => -1, all => 1, infobox => 1, rot => 0, sel => 0, + fullscreen => 0, ); + # 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) + and $defsettings{'xres'} = $defsettings{'yres'} = undef; + # Reduce the front page load when in overload mode. if (Sesse::pr0n::Overload::is_in_overload($r)) { $defsettings{'num'} = 100; @@ -51,12 +57,12 @@ sub handler { my %settings = %defsettings; - for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel) { + for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen) { my $val = $apr->param($s); if (defined($val) && $val =~ /^(\d+)$/) { $settings{$s} = $val; } - if ($s eq "num" && defined($val) && $val == -1) { + if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) { $settings{$s} = $val; } } @@ -76,162 +82,219 @@ sub handler { $num = undef; } - my $ref = $dbh->selectrow_hashref('SELECT * FROM events WHERE id=? AND vhost=?', + $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'}; + my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'})); + my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'})); + $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); 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)) { - $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()"); - } + my $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") + or dberror($r, "prepare()"); $q->execute($event) or dberror($r, "image enumeration"); # Print the page itself - Sesse::pr0n::Common::header($r, "$name [$event]"); - Sesse::pr0n::Templates::print_template($r, "date", { date => $date }); - - if (Sesse::pr0n::Overload::is_in_overload($r)) { - Sesse::pr0n::Templates::print_template($r, "overloadmode"); - } + if ($settings{'fullscreen'}) { + $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(" \"" . $infobox . $ref->{'filename'} . "\",\n"); + } - print_thumbsize($r, $event, \%settings, \%defsettings); - 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); + my %settings_no_fullscreen = %settings; + $settings_no_fullscreen{'fullscreen'} = 0; - my $toclose = 0; - my $lastupl = ""; - - # Print out all thumbnails - if ($rot == 1) { - $r->print("
\n"); - - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; - } + my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" . + Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings); - 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\""; - } + # *whistle* + $returnurl =~ s/&/&/g; - my $filename = $ref->{'filename'}; - my $uri = $filename; - if (defined($xres) && defined($yres)) { - $uri = "${xres}x$yres/$infobox$filename"; - } + Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", { + vhost => $r->get_server_name, + event => $event, + start => $settings{'start'} - 1, + returnurl => $returnurl, + sel => $settings{'sel'}, + }); + } else { + Sesse::pr0n::Common::header($r, "$name [$event]"); + Sesse::pr0n::Templates::print_template($r, "date", { date => $date }); - $r->print("

\"\"$imgsz\n"); - $r->print(" 90 {'id'} . "-90\" />\n"); - $r->print(" 180 {'id'} . "-180\" />\n"); - $r->print(" 270 {'id'} . "-270\" />\n"); - $r->print("        " . - "     Del {'id'} . "\" />

\n"); + if (Sesse::pr0n::Overload::is_in_overload($r)) { + Sesse::pr0n::Templates::print_template($r, "overloadmode"); } - $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 = $filename; - if (defined($xres) && defined($yres)) { - $uri = "${xres}x$yres/$infobox$filename"; + print_thumbsize($r, $event, \%settings, \%defsettings); + print_viewres($r, $event, \%settings, \%defsettings); + print_pagelimit($r, $event, \%settings, \%defsettings); + print_infobox($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(" + SELECT + TRIM(model.value) AS model, + coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens, + COUNT(*) AS num + FROM ( SELECT * FROM images WHERE event=? $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 model.tag='Model' + GROUP BY 1,2 + ORDER BY 1,2") + or die "Couldn't prepare to find equipment: $!"; + $eq->execute($event) + or die "Couldn't find equipment: $!"; + + my @equipment = (); + my %cameras_seen = (); + while (my $ref = $eq->fetchrow_hashref) { + if (!defined($ref->{'lens'}) && exists($cameras_seen{$ref->{'model'}})) { + # + # Some compact cameras seem to add lens info sometimes and not at other + # times; if we have seen a camera with at least one specific lens earlier, + # just combine entries without a lens with the previous one. + # + $equipment[$#equipment]->{'num'} += $ref->{'num'}; + next; } - - my $selected = $ref->{'selected'} ? ' checked="checked"' : ''; - - $r->print("

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

\n"); + push @equipment, $ref; + $cameras_seen{$ref->{'model'}} = 1; } - $r->print(" \n"); - $r->print("
\n"); - } else { - while (my $ref = $q->fetchrow_hashref()) { - my $imgsz = ""; - my $takenby = $ref->{'takenby'}; - if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; + $eq->finish; + + if (scalar @equipment > 0) { + Sesse::pr0n::Templates::print_template($r, "equipment-start"); + for my $e (@equipment) { + my $eqspec = $e->{'model'}; + $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'})); + + # This isn't correct for all languages. Fix if we ever need to care. :-) + if ($e->{'num'} == 1) { + Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec }); + } else { + Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} }); + } } + Sesse::pr0n::Templates::print_template($r, "equipment-end"); + } - if ($takenby ne $lastupl) { - $r->print("

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

\n"); - } - 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 = $filename; - if (defined($xres) && defined($yres)) { - $uri = "${xres}x$yres/$infobox$filename"; - } + my $toclose = 0; + my $lastupl = ""; + my $img_num = $start; + + # 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'}; + if (defined($ref->{'day'})) { + $takenby .= ", " . $ref->{'day'}; + } + + 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'}; + 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"; + } + + $r->print("

\"\"$imgsz\n"); + $r->print(" 90 {'id'} . "-90\" />\n"); + $r->print(" 180 {'id'} . "-180\" />\n"); + $r->print(" 270 {'id'} . "-270\" />\n"); + $r->print("        " . + "     Del {'id'} . "\" />

\n"); - $r->print(" \"\"$imgsz\n"); + ++$img_num; + } + $r->print(" \n"); + $r->print("
\n"); + } else { + while (my $ref = $q->fetchrow_hashref()) { + my $imgsz = ""; + my $takenby = $ref->{'takenby'}; + if (defined($ref->{'day'})) { + $takenby .= ", " . $ref->{'day'}; + } + + if ($takenby ne $lastupl) { + $r->print("

\n\n") if ($lastupl ne ""); + $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"); + $r->print("

\n"); + } + 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"; + } + + $r->print(" \"\"$imgsz\n"); + + ++$img_num; + } + $r->print("

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

\n"); - } - print_nextprev($r, $event, \%settings, \%defsettings); - Sesse::pr0n::Common::footer($r); + print_nextprev($r, $event, \%settings, \%defsettings); + Sesse::pr0n::Common::footer($r); + } return Apache2::Const::OK; } @@ -252,16 +315,23 @@ sub print_changes { $r->print("

$title:\n"); for my $a (@$alternatives) { - # Parse the current alternative - my ($v1, $v2) = split /x/, $a; + my $text; my %newsettings = %$settings; - if (defined($v1) && defined($v2)) { + if (ref $a) { + my ($v1, $v2); + ($text, $v1, $v2) = @$a; + $newsettings{$var1} = $v1; $newsettings{$var2} = $v2; } else { - $newsettings{$var1} = undef; - $newsettings{$var2} = undef; + $text = $a; + + # Parse the current alternative + my ($v1, $v2) = split /x/, $a; + + $newsettings{$var1} = $v1; + $newsettings{$var2} = $v2; } $r->print(" "); @@ -269,9 +339,9 @@ sub print_changes { # Check if these settings are current (print only label) if (eq_with_undef($settings->{$var1}, $newsettings{$var1}) && eq_with_undef($settings->{$var2}, $newsettings{$var2})) { - $r->print($a); + $r->print($text); } else { - Sesse::pr0n::Common::print_link($r, $a, "/$event/", \%newsettings, $defsettings); + Sesse::pr0n::Common::print_link($r, $text, "/$event/", \%newsettings, $defsettings); } $r->print("\n"); } @@ -289,7 +359,9 @@ sub print_viewres { my ($r, $event, $settings, $defsettings) = @_; my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960); chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited')); - push @alternatives, $unlimited; + chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original')); + push @alternatives, [ $unlimited, undef, undef ]; + push @alternatives, [ $original, -1, -1 ]; print_changes($r, $event, 'viewres', $settings, $defsettings, 'xres', 'yres', \@alternatives); @@ -361,13 +433,15 @@ 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=?', + my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE event=? $where", undef, $event) or dberror($r, "image enumeration"); my $num_images = $ref->{'num_images'}; @@ -379,7 +453,7 @@ sub print_nextprev { $end = $num_images; } - $r->print("

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

\n"); # Previous if ($start > 1) { @@ -395,7 +469,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 @@ -413,7 +488,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("

\n"); @@ -448,6 +524,33 @@ sub print_selected { $r->print('

'); } + +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("

"); + 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;