Remove the "single" debugging code that has probably been there for ages and

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index fab7971956a166bf54f4ed5431c727bc08f0e2df..db07bc816a1ee979fbe9d53220bb2289efbcf071 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -64,7 +64,8 @@ sub handler {
                sel => 0,
                fullscreen => 0,
                model => undef,
-               lens => undef
+               lens => undef,
+               author => undef
        );
        
        my $where;
@@ -89,7 +90,7 @@ sub handler {
                
        my %settings = %defsettings;
 
-       for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens) {
+       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;
@@ -97,7 +98,7 @@ 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") {
+               if ($s eq "model" || $s eq "lens" || $s eq "author") {
                        $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
                }
        }
@@ -114,6 +115,7 @@ sub handler {
        my $sel = $settings{'sel'};
        my $model = $settings{'model'};
        my $lens = $settings{'lens'};
+       my $author = $settings{'author'};
 
        # Construct SQL for this filter
        if ($all == 0) {
@@ -138,6 +140,11 @@ sub handler {
                        $where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
                }
        }
+       if (defined($author)) {
+               my $aq = $dbh->quote($author);
+
+               $where .= " AND takenby=$aq";
+       }
 
        if (defined($num) && $num == -1) {
                $num = undef;
@@ -289,10 +296,12 @@ sub handler {
                                                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);
@@ -321,15 +330,32 @@ sub handler {
                while (my $ref = $q->fetchrow_hashref()) {
                        my $imgsz = "";
                        my $takenby = $ref->{'takenby'};
+                       my $day = '';
                        if (defined($ref->{'day'})) {
-                                $takenby .= ", " . $ref->{'day'};
+                               $day = ", " . $ref->{'day'};
                        }
 
                        if ($takenby ne $lastupl) {
                                $r->print("    </p>\n\n") if ($lastupl ne "" && $rot != 1);
                                $lastupl = $takenby;
+
+                               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 $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
+                               
                                $r->print("    <h2>");
-                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day });
                                print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                $r->print("</h2>\n");
 
@@ -640,9 +666,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;