Split infobox generation out into its own function.

[pr0n] / perl / Sesse / pr0n / Listing.pm

diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm
index 37f67c75dfab2ebf630fb74973a8ce43d2245290..fd9f9041e2114275eac2432b577ae0d7dbd8d600 100644 (file)
--- a/perl/Sesse/pr0n/Listing.pm
+++ b/perl/Sesse/pr0n/Listing.pm
@@ -3,54 +3,75 @@ use strict;
 use warnings;
 
 use Sesse::pr0n::Common qw(error dberror);
+use HTML::TagCloud;
 
 sub handler {
        my $r = shift;
        my $dbh = Sesse::pr0n::Common::get_dbh();
 
         # Internal? (Ugly?)
-       if ($r->get_server_name =~ /internal/ || $r->get_server_name =~ /skoyen\.bilder\.knatten\.com/ || $r->get_server_name =~ /lia\.heimdal\.org/) {
+       if (Sesse::pr0n::Common::get_server_name($r) =~ /internal/ ||
+           Sesse::pr0n::Common::get_server_name($r) =~ /skoyen\.bilder\.knatten\.com/ ||
+           Sesse::pr0n::Common::get_server_name($r) =~ /lia\.heimdal\.org/) {
                my $user = Sesse::pr0n::Common::check_access($r);
-               if (!defined($user)) {
-                       return Apache2::Const::OK;
-               }
+               return Sesse::pr0n::Common::generate_401($r) if (!defined($user));
        }
        
+       # Fix common error: pr0n.sesse.net/+foo -> pr0n.sesse.net/+foo/
+       if ($r->path_info !~ /\/$/) {
+               my $res = Plack::Response->new(301);
+               $res->header('Location' => $r->path_info . "/");
+               return $res;
+       }
+
+       my $res = Plack::Response->new(200);
+       my $io = IO::String->new;
+       
        # find the last modification
-       my $ref = $dbh->selectrow_hashref('SELECT EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? ORDER BY last_update DESC LIMIT 1',
-               undef, $r->get_server_name)
-               or error($r, "Could not any events", 404, "File not found");
-       $r->set_last_modified($ref->{'last_update'});
-       $r->content_type('text/html; charset=utf-8');
+       my $ref = $dbh->selectrow_hashref('SELECT EXTRACT(EPOCH FROM last_update) AS last_update FROM last_picture_cache WHERE vhost=? ORDER BY last_update DESC LIMIT 1',
+               undef, Sesse::pr0n::Common::get_server_name($r))
+               or return error($r, "Could not find any events", 404, "File not found");
+       Sesse::pr0n::Common::set_last_modified($r, $ref->{'last_update'});
+       $res->content_type('text/html; charset=utf-8');
                                
-       # If the client can use cache, do so
-       if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
-               return $rc;
-       }
+       # # If the client can use cache, do so
+       # if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
+       #       return $rc;
+       # }
+       
+       # main listing
+#              my $q = $dbh->prepare('SELECT t1.id,t1.date,t1.name FROM events t1 LEFT JOIN images t2 ON t1.id=t2.event WHERE t1.vhost=? GROUP BY t1.id,t1.date,t1.name ORDER BY COALESCE(MAX(t2.date),\'1970-01-01 00:00:00\'),t1.id') or
+#                      dberror($r, "Couldn't list events");
+       my $q = $dbh->prepare('SELECT event,date,name FROM events e JOIN last_picture_cache c USING (vhost,event) WHERE vhost=? ORDER BY last_picture DESC NULLS LAST')
+               or return dberror($r, "Couldn't list events");
+       $q->execute(Sesse::pr0n::Common::get_server_name($r))
+               or return dberror($r, "Couldn't get events");
+       
+       Sesse::pr0n::Common::header($r, $io, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
 
-#      my $q = $dbh->prepare('SELECT t1.id,t1.date,t1.name FROM events t1 LEFT JOIN images t2 ON t1.id=t2.event WHERE t1.vhost=? GROUP BY t1.id,t1.date,t1.name ORDER BY COALESCE(MAX(t2.date),\'1970-01-01 00:00:00\'),t1.id') or
-#              dberror($r, "Couldn't list events");
-       my $q = $dbh->prepare('SELECT event,date,name FROM events e JOIN last_picture_cache c USING (vhost,event) WHERE vhost=? ORDER BY last_picture DESC')
-               or dberror($r, "Couldn't list events");
-       $q->execute($r->get_server_name)
-               or dberror($r, "Couldn't get events");
+       my $allcaption = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
+       $io->print("    <ul>\n");
+       $io->print("      <li><a href=\"+all/\">$allcaption</a></li>\n");
+       $io->print("    </ul>\n");
        
-       Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
-       $r->print("    <ul>\n");
+       $io->print("    <ul>\n");
 
        while (my $ref = $q->fetchrow_hashref()) {
                my $id = $ref->{'event'};
-               my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
-               my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
+               my $date = HTML::Entities::encode_entities($ref->{'date'});
+               my $name = HTML::Entities::encode_entities($ref->{'name'});
                
-               $r->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
+               $io->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
        }
 
-       $r->print("    </ul>\n");
-       Sesse::pr0n::Common::footer($r);
+       $io->print("    </ul>\n");
+       Sesse::pr0n::Common::footer($r, $io);
 
        $q->finish();
-       return Apache2::Const::OK;
+
+       $io->setpos(0);
+       $res->body($io);
+       return $res;
 }
 
 1;