X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=3597deeaff849d37d19cacffd3da4d9a4ce9eb08;hp=335dcd2566fbc00e47c6f04963d2b73a94f3a691;hb=6951b59b735a70aec51ceeab7a188d6f6cf75a9f;hpb=576c411da9608bb7155e89811694f9f19e542773 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 335dcd2..3597dee 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -11,19 +11,37 @@ sub handler { my $apr = Apache2::Request->new($r); my $dbh = Sesse::pr0n::Common::get_dbh(); - # Find the event - $r->uri =~ m#^/([a-zA-Z0-9-]+)/?$# - or error($r, "Could not extract event"); - my $event = $1; + my ($event, $abspath, $datesort, $tag); + if ($r->uri =~ /^\/\+all\/?/) { + $event = '+all'; + $abspath = 1; + $tag = undef; + + $datesort = 'DESC NULLS LAST'; + } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) { + $tag = $1; + $event = "+tags/$tag"; + $abspath = 1; + + $datesort = 'DESC NULLS LAST'; + } else { + # Find the event + $r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/ + or error($r, "Could not extract event"); + $event = $1; + $abspath = 0; + $tag = undef; + $datesort = 'ASC NULLS LAST'; + } # Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/ - if ($r->uri !~ m#/$#) { - $r->headers_out->{'location'} = "/$event/"; + if ($r->uri !~ /\/$/) { + $r->headers_out->{'location'} = $r->uri . "/"; return Apache2::Const::REDIRECT; } # Internal? (Ugly?) - if ($r->get_server_name =~ /internal/) { + 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; @@ -34,16 +52,35 @@ sub handler { my %defsettings = ( thumbxres => 80, thumbyres => 64, - xres => undef, - yres => undef, + xres => -1, + yres => -1, start => 1, - num => -1, + num => 250, all => 1, infobox => 1, rot => 0, sel => 0, + fullscreen => 0, + model => undef, + lens => undef, + author => undef ); + my $where; + if (defined($tag)) { + my $tq = $dbh->quote($tag); + $where = " AND id IN ( SELECT image FROM tags WHERE tag=$tq )"; + } elsif ($event eq '+all') { + $where = ''; + } 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' LIMIT 1", + undef, $r->get_server_name) + 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,7 +88,7 @@ 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 model lens author) { my $val = $apr->param($s); if (defined($val) && $val =~ /^(\d+)$/) { $settings{$s} = $val; @@ -59,6 +96,9 @@ sub handler { if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) { $settings{$s} = $val; } + if ($s eq "model" || $s eq "lens" || $s eq "author") { + $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val); + } } my $thumbxres = $settings{'thumbxres'}; @@ -71,151 +111,258 @@ sub handler { my $infobox = $settings{'infobox'} ? '' : 'nobox/'; my $rot = $settings{'rot'}; my $sel = $settings{'sel'}; + my $model = $settings{'model'}; + my $lens = $settings{'lens'}; + my $author = $settings{'author'}; + + # Construct SQL for this filter + if ($all == 0) { + $where .= ' AND selected=\'t\''; + } + if (defined($model) && defined($lens)) { + my $mq = $dbh->quote($model); + my $lq = $dbh->quote($lens); + + if ($model eq '') { + # no defined model + $where .= " AND model IS NULL"; + } else { + $where .= " AND model=$mq"; + } + + if ($lens eq '') { + # no defined lens + $where .= " AND lens IS NULL"; + } else { + $where .= " AND lens=$lq"; + } + } + if (defined($author)) { + my $aq = $dbh->quote($author); + + $where .= " AND takenby=$aq"; + } if (defined($num) && $num == -1) { $num = undef; } - my $ref = $dbh->selectrow_hashref('SELECT * 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 ($date, $name); + + if ($event eq '+all' || defined($tag)) { + $ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM last_picture_cache WHERE vhost=?", + undef, $r->get_server_name) + or error($r, "Could not list events", 404, "File not found"); + $date = undef; + $name = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title'); + $r->set_last_modified($ref->{'last_update'}); + } else { + $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events NATURAL JOIN last_picture_cache WHERE vhost=? AND event=?", + undef, $r->get_server_name, $event) + or error($r, "Could not find event $event", 404, "File not found"); - my $name = $ref->{'name'}; - my $date = $ref->{'date'}; + $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'})); + $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); + $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS num_selected FROM images WHERE vhost=? $where AND selected=\'t\'", undef, $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)) { - $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 vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit") + or dberror($r, "prepare()"); + $q->execute($r->get_server_name) 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 ($settings{'fullscreen'}) { + $r->content_type("text/html; charset=utf-8"); - if (Sesse::pr0n::Overload::is_in_overload($r)) { - Sesse::pr0n::Templates::print_template($r, "overloadmode"); - } - - 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); + if (defined($tag)) { + my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag }); + Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => $title }); + } else { + Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" }); + } - my $toclose = 0; - my $lastupl = ""; - - # Print out all thumbnails - if ($rot == 1) { - $r->print("
\n"); - } elsif ($sel == 1) { - $r->print(" \n"); - } else { + while (my $ref = $q->fetchrow_hashref()) { my $imgsz = ""; my $takenby = $ref->{'takenby'}; + my $day = ''; if (defined($ref->{'day'})) { - $takenby .= ", " . $ref->{'day'}; + $day = ", " . $ref->{'day'}; } - 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"); + my $groupkey = $takenby . $day; + + if ($groupkey ne $lastupl) { + $r->print("
\n\n") if ($lastupl ne "" && $rot != 1); + $lastupl = $groupkey; + + my %newsettings = %settings; + + my $action; + if (defined($author)) { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter")); + $newsettings{'author'} = undef; + $newsettings{'start'} = 1; + } else { + chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter")); + $newsettings{'author'} = $ref->{'takenby'}; + $newsettings{'start'} = 1; + } + + my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings); + + $r->print("\n"); + } } - if ($ref->{'width'} != -1 && $ref->{'height'} != -1) { + + if (defined($ref->{'width'}) && defined($ref->{'height'})) { my $width = $ref->{'width'}; my $height = $ref->{'height'}; @@ -224,20 +371,49 @@ 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) { $uri = "original/$infobox$filename"; } - $r->print(" \n"); + my $prefix = ""; + if ($abspath) { + $prefix = "/" . $ref->{'event'} . "/"; + } + + if ($rot == 1) { + $r->print("
"); + } else { + $r->print(" "); + } + $r->print("\n"); + + if ($rot == 1) { + $r->print(" 90 {'id'} . "-90\" />\n"); + $r->print(" 180 {'id'} . "-180\" />\n"); + $r->print(" 270 {'id'} . "-270\" />\n"); + $r->print(" " . + " Del {'id'} . "\" />
\n"); + } + + ++$img_num; + } + + if ($rot == 1) { + $r->print(" \n"); + $r->print(" \n"); + } else { + $r->print(" \n"); } - $r->print(" \n"); - } - print_nextprev($r, $event, \%settings, \%defsettings); - Sesse::pr0n::Common::footer($r); + print_nextprev($r, $event, $where, \%settings, \%defsettings); + Sesse::pr0n::Common::footer($r); + } return Apache2::Const::OK; } @@ -300,7 +476,7 @@ sub print_thumbsize { } sub print_viewres { my ($r, $event, $settings, $defsettings) = @_; - my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960); + my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536); 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, undef, undef ]; @@ -319,7 +495,7 @@ sub print_pagelimit { # Get choices chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited')); - my @alternatives = qw(10 50 100 500); + my @alternatives = qw(10 50 100 250 500); push @alternatives, $unlimited; for my $num (@alternatives) { @@ -373,7 +549,7 @@ sub print_infobox { } sub print_nextprev { - my ($r, $event, $settings, $defsettings) = @_; + my ($r, $event, $where, $settings, $defsettings) = @_; my $start = $settings->{'start'}; my $num = $settings->{'num'}; my $dbh = Sesse::pr0n::Common::get_dbh(); @@ -382,8 +558,8 @@ 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 event=?', - undef, $event) + my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE vhost=? $where", + undef, $r->get_server_name) or dberror($r, "image enumeration"); my $num_images = $ref->{'num_images'}; @@ -394,7 +570,7 @@ sub print_nextprev { $end = $num_images; } - $r->print("\n"); + $r->print("
\n"); # Previous if ($start > 1) { @@ -410,7 +586,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 @@ -428,7 +605,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"); @@ -463,6 +641,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;