]> git.sesse.net Git - pr0n/blobdiff - perl/Sesse/pr0n/Index.pm
Fix some issues with the WebDAV server and post-10.4 OS X.
[pr0n] / perl / Sesse / pr0n / Index.pm
index e91d9c17b485264f9fd6b3b2acf5a7722513c72f..0fbd82893b41051d8a944eecbf3228844a899e10 100644 (file)
@@ -11,19 +11,39 @@ 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; 
+
+               # augh, this needs 8.3, so we'll have to fiddle around a bit instead
+               # $datesort = 'DESC NULLS LAST';
+               $datesort = 'DESC';
+       } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) {
+               $tag = $1;
+               $event = "+tags/$tag";
+               $abspath = 1;
+               
+               $datesort = 'DESC';
+       } 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';
+       }
 
        # 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/ || $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;
@@ -37,17 +57,30 @@ sub handler {
                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 event=? AND LOWER(filename) LIKE \'%.nef\' LIMIT 1',
-               undef, $event)
+       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.
@@ -57,7 +90,7 @@ sub handler {
                
        my %settings = %defsettings;
 
-       for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen) {
+       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;
@@ -65,6 +98,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'};
@@ -77,18 +113,60 @@ 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;
        }
 
-       $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 ($date, $name);
 
-       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 ($event eq '+all' || defined($tag)) {
+               $ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events 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 WHERE vhost=? AND event=?",
+                       undef, $r->get_server_name, $event)
+                       or error($r, "Could not find event $event", 404, "File not found");
+
+               $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) {
@@ -96,24 +174,39 @@ 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 vhost=? $where AND selected=\'t\'", undef, $r->get_server_name);
        my $num_selected = $ref->{'num_selected'};
 
        # Find all images related to this event.
-       my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
        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 event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit")
+       my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY COALESCE((date - INTERVAL '6 hours')::date, '1970-01-01') $datesort,takenby,date,filename $limit")
                or dberror($r, "prepare()");
-       $q->execute($event)
+       $q->execute($r->get_server_name)
                or dberror($r, "image enumeration");
 
        # Print the page itself
        if ($settings{'fullscreen'}) {
                $r->content_type("text/html; charset=utf-8");
-               Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+
+               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 @files = ();
                while (my $ref = $q->fetchrow_hashref()) {
-                       $r->print("        \"" . $infobox . $ref->{'filename'} . "\",\n");
+                       my $width = defined($ref->{'width'}) ? $ref->{'width'} : -1;
+                       my $height = defined($ref->{'height'}) ? $ref->{'height'} : -1;
+                       push @files, [ $ref->{'event'}, $ref->{'filename'}, $width, $height ];
+               }
+               
+               for my $i (0..$#files) {
+                       my $line = sprintf "        [ \"%s\", \"%s\", %d, %d ]", @{$files[$i]};
+                       $line .= "," unless ($i == $#files);
+                       $r->print($line . "\n");
                }
 
                my %settings_no_fullscreen = %settings;
@@ -121,20 +214,40 @@ sub handler {
 
                my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
                        Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
+               
+               my %settings_bookmark = %settings;
+               $settings_bookmark{'start'} = $defsettings{'start'};
+               my $bookmark_url_base = "http://" . $r->get_server_name . "/" . $event . "/" .
+                       Sesse::pr0n::Common::get_query_string(\%settings_bookmark, \%defsettings);
+
+               if ($bookmark_url_base =~ /\?/) {
+                       $bookmark_url_base .= ';start=';
+               } else {
+                       $bookmark_url_base .= '?start=';
+               }
 
                # *whistle*
                $returnurl =~ s/&/&/g;
+               $bookmark_url_base =~ s/&/&/g;
 
                Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
                        vhost => $r->get_server_name,
-                       event => $event,
                        start => $settings{'start'} - 1,
                        returnurl => $returnurl,
+                       bookmarkurlbase => $bookmark_url_base,
                        sel => $settings{'sel'},
+                       infobox => $infobox
                });
        } else {
-               Sesse::pr0n::Common::header($r, "$name [$event]");
-               Sesse::pr0n::Templates::print_template($r, "date", { date => $date });
+               if (defined($tag)) {
+                       my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag });
+                       Sesse::pr0n::Common::header($r, $title);
+               } else {
+                       Sesse::pr0n::Common::header($r, "$name [$event]");
+               }
+               if (defined($date)) {
+                       Sesse::pr0n::Templates::print_template($r, "date", { date => $date });
+               }
 
                if (Sesse::pr0n::Overload::is_in_overload($r)) {
                        Sesse::pr0n::Templates::print_template($r, "overloadmode");
@@ -146,59 +259,75 @@ sub handler {
                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;
+               print_nextprev($r, $event, $where, \%settings, \%defsettings);
+       
+               if (1 || $event ne '+all') {
+                       # Find the equipment used
+                       my $eq = $dbh->prepare("
+                               SELECT
+                                       model,
+                                       lens,
+                                       COUNT(*) AS num
+                               FROM images
+                               WHERE vhost=? $where
+                               GROUP BY 1,2
+                               ORDER BY 1,2")
+                               or die "Couldn't prepare to find equipment: $!";
+                       $eq->execute($r->get_server_name)
+                               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;
+                               }
+                               push @equipment, $ref;
+                               $cameras_seen{$ref->{'model'}} = 1;
                        }
-                       push @equipment, $ref;
-                       $cameras_seen{$ref->{'model'}} = 1;
-               }
-               $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'} });
+                       $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'}));
+                                       $eqspec = HTML::Entities::encode_entities($eqspec);
+
+                                       my %newsettings = %settings;
+
+                                       my $action;
+                                       if (defined($model) && defined($lens)) {
+                                               chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
+                                               $newsettings{'model'} = undef;
+                                               $newsettings{'lens'} = undef;
+                                               $newsettings{'start'} = 1;
+                                       } else {
+                                               chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
+                                               $newsettings{'model'} = $e->{'model'};
+                                               $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+                                               $newsettings{'start'} = 1;
+                                       }
+                                       
+                                       my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
+
+                                       # 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, filterurl => $url, action => $action });
+                                       } else {
+                                               Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action });
+                                       }
                                }
+                               Sesse::pr0n::Templates::print_template($r, "equipment-end");
                        }
-                       Sesse::pr0n::Templates::print_template($r, "equipment-end");
                }
 
-
                my $toclose = 0;
                my $lastupl = "";
                my $img_num = (defined($start) && defined($num)) ? $start : 1;
@@ -207,38 +336,76 @@ sub handler {
                if ($rot == 1) {
                        $r->print("    <form method=\"post\" action=\"/rotate\">\n");
                        $r->print("      <input type=\"hidden\" name=\"event\" value=\"$event\" />\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("    <h2>");
-                                       Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
-                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
-                                       $r->print("</h2>\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\"";
+               while (my $ref = $q->fetchrow_hashref()) {
+                       my $imgsz = "";
+                       my $takenby = $ref->{'takenby'};
+                       my $day = '';
+                       if (defined($ref->{'day'})) {
+                               $day = ", " . $ref->{'day'};
+                       }
+
+                       my $groupkey = $takenby . $day;
+
+                       if ($groupkey ne $lastupl) {
+                               $r->print("    </p>\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 $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 $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
+                               
+                               $r->print("    <h2>");
+                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $takenby, action => $action, filterurl => $url, date => $day });
+                               print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+                               $r->print("</h2>\n");
+
+                               if ($rot != 1) {
+                                       $r->print("    <p class=\"photos\">\n");
                                }
+                       }
 
-                               $r->print("    <p><a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+                       if (defined($ref->{'width'}) && defined($ref->{'height'})) {
+                               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 $prefix = "";
+                       if ($abspath) {
+                               $prefix = "/" . $ref->{'event'} . "/";
+                       }
+               
+                       if ($rot == 1) {        
+                               $r->print("    <p>");
+                       } else {
+                               $r->print("     ");
+                       }
+                       $r->print("<a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+               
+                       if ($rot == 1) {
                                $r->print("      90 <input type=\"checkbox\" name=\"rot-" .
                                        $ref->{'id'} . "-90\" />\n");
                                $r->print("      180 <input type=\"checkbox\" name=\"rot-" .
@@ -247,52 +414,19 @@ sub handler {
                                        $ref->{'id'} . "-270\" />\n");
                                $r->print("      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" .
                                        "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
-                       
-                               ++$img_num;
                        }
+                       
+                       ++$img_num;
+               }
+
+               if ($rot == 1) {
                        $r->print("      <input type=\"submit\" value=\"Rotate\" />\n");
                        $r->print("    </form>\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("    </p>\n\n") if ($lastupl ne "");
-                                       $lastupl = $takenby;
-                                       $r->print("    <h2>");
-                                       Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
-                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
-                                       $r->print("</h2>\n");
-                                       $r->print("    <p class=\"photos\">\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("      <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
-                               
-                               ++$img_num;
-                       }
                        $r->print("    </p>\n");
                }
 
-               print_nextprev($r, $event, \%settings, \%defsettings);
+               print_nextprev($r, $event, $where, \%settings, \%defsettings);
                Sesse::pr0n::Common::footer($r);
        }
 
@@ -357,7 +491,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 1280x960 1400x1050 1600x1200);
        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 ];
@@ -376,7 +510,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) {
@@ -430,19 +564,17 @@ 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 $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=? $where",
-               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'};
 
@@ -547,9 +679,9 @@ sub print_fullscreen_fromhere {
        $newsettings{'fullscreen'} = 1;
        $newsettings{'start'} = $start;
 
-        $r->print("    <p class=\"fsfromhere\">");
+        $r->print("    <span class=\"fsfromhere\">");
        Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
-       $r->print("</p>\n");
+       $r->print("</span>\n");
 }
        
 1;