Add a new 2304x1728 resolution (twice 1152x864), for fitting better into 30-inch...

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

diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm
index 6f47355f4596631f9d20693dc48c48d5ba8c961a..2cb1125277e3be0e92d8df47b29792902b7d2a6c 100644 (file)
--- a/perl/Sesse/pr0n/Listing.pm
+++ b/perl/Sesse/pr0n/Listing.pm
@@ -3,6 +3,7 @@ use strict;
 use warnings;
 
 use Sesse::pr0n::Common qw(error dberror);
+use HTML::TagCloud;
 
 sub handler {
        my $r = shift;
@@ -16,10 +17,16 @@ sub handler {
                }
        }
        
+       # Fix common error: pr0n.sesse.net/+foo -> pr0n.sesse.net/+foo/
+       if ($r->uri !~ /\/$/) {
+               $r->headers_out->{'location'} = $r->uri . "/";
+               return Apache2::Const::REDIRECT;
+       }
+       
        # 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',
+       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, $r->get_server_name)
-               or error($r, "Could not any events", 404, "File not found");
+               or error($r, "Could not find any events", 404, "File not found");
        $r->set_last_modified($ref->{'last_update'});
        $r->content_type('text/html; charset=utf-8');
                                
@@ -27,34 +34,70 @@ sub handler {
        if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
                return $rc;
        }
-
-#      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");
        
-       Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
-       my $allcaption = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
-       $r->print("    <ul>\n");
-       $r->print("      <li><a href=\"+all/\">$allcaption</a></li>\n");
-       $r->print("    </ul>\n");
-       
-       $r->print("    <ul>\n");
+       if ($r->uri =~ /^\/\+tags\/?/) {
+               # Tag cloud
+               my $q = $dbh->prepare('SELECT tag,COUNT(*) AS frequency FROM tags t JOIN images i ON t.image=i.id WHERE vhost=? GROUP BY tag ORDER BY COUNT(*) DESC LIMIT 75')
+                       or dberror($r, "Couldn't list events");
+               $q->execute($r->get_server_name)
+                       or dberror($r, "Couldn't get events");
+               
+               Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'tag-listing'));
+               Sesse::pr0n::Templates::print_template($r, 'mainmenu-tags');
+
+               my $cloud = HTML::TagCloud->new;
+
+               while (my $ref = $q->fetchrow_hashref()) {
+                       my $tag = Encode::decode_utf8($ref->{'tag'});
+                       my $html = HTML::Entities::encode_entities($tag);    # is this right?
+                       my $uri = Sesse::pr0n::Common::pretty_escape($tag);  # and this?
+
+                       $cloud->add($html, "/+tags/$uri/", $ref->{'frequency'});
+               }
+
+               $r->print($cloud->html_and_css());
+               Sesse::pr0n::Common::footer($r);
 
-       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'}));
+               $q->finish();
+       } else {
+               # 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 dberror($r, "Couldn't list events");
+               $q->execute($r->get_server_name)
+                       or dberror($r, "Couldn't get events");
                
-               $r->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
-       }
+               Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
+
+               # See if there are any tags related to this vhost
+               my $ref = $dbh->selectrow_hashref('SELECT * FROM tags t JOIN images i ON t.image=i.id WHERE vhost=? LIMIT 1',
+                       undef, $r->get_server_name);
+               if (defined($ref)) {
+                       Sesse::pr0n::Templates::print_template($r, 'mainmenu-events');
+               }
+
+               my $allcaption = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
+               $r->print("    <ul>\n");
+               $r->print("      <li><a href=\"+all/\">$allcaption</a></li>\n");
+               $r->print("    </ul>\n");
+               
+               $r->print("    <ul>\n");
 
-       $r->print("    </ul>\n");
-       Sesse::pr0n::Common::footer($r);
+               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'}));
+                       
+                       $r->print("      <li><a href=\"$id/\">$name</a> ($date)</li>\n");
+               }
+
+               $r->print("    </ul>\n");
+               Sesse::pr0n::Common::footer($r);
+
+               $q->finish();
+       }
 
-       $q->finish();
        return Apache2::Const::OK;
 }