Revert r147, as planned.

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

diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm
index 0d63c6d004a25e3ffe9292154d6ce8f1dcfeccd5..02ac273cfac7e7a99157661d0cbdd83c0bcd9033 100644 (file)
--- a/perl/Sesse/pr0n/Listing.pm
+++ b/perl/Sesse/pr0n/Listing.pm
@@ -16,27 +16,30 @@ sub handler {
                }
        }
 
-
+#      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 @events = ();
+       $r->content_type('text/html; charset=utf-8');
+
+       Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
+       $r->print("    <ul>\n");
+
        while (my $ref = $q->fetchrow_hashref()) {
                my $id = $ref->{'event'};
-               my $date = Encode::decode_utf8($ref->{'date'});
-               my $name = Encode::decode_utf8($ref->{'name'});
-       
-               push @events, {
-                       'a' => $name,
-                       'a/href' => "$id/",
-                       'date' => $date
-               };
+               my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
+               my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
+               
+               $r->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
        }
-       $q->finish();
 
-       Sesse::pr0n::Templates::output_page($r, 'listing.xml', { 'ul' => \@events });
+       $r->print("    </ul>\n");
+       Sesse::pr0n::Common::footer($r);
+
+       $q->finish();
        return Apache2::Const::OK;
 }