On the all-images event, hide images from hidden events.

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 7d2ddf8227703ae74a51a066557c06b81f5bf55e..1be7b9e63e2a1ccf436519561005f5281432c2eb 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -58,7 +58,7 @@ sub handler {
        
        my $where;
        if ($event eq '+all') {
        
        my $where;
        if ($event eq '+all') {

-               $where = '';
+               $where = ' AND (event,vhost) IN ( SELECT event,vhost FROM events WHERE NOT hidden )';

        } else {
                $where = ' AND event=' . $dbh->quote($event);
        }
        } else {
                $where = ' AND event=' . $dbh->quote($event);
        }


@@ -122,9 +122,8 @@ sub handler {
                }
        }
        if (defined($author)) {
                }
        }
        if (defined($author)) {

-               my $aq = $dbh->quote($author);
-
-               $where .= " AND takenby=$aq";
+               my @authors = split /,/, $author;
+               $where .= " AND takenby IN (" . join(', ', map { $dbh->quote($_) } @authors) . ")";

        }
 
        if (defined($num) && $num == -1) {
        }
 
        if (defined($num) && $num == -1) {