Remove some really long-standing silliness: If we have no idea about width

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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 239c4b9d8f612a3ff753ecad0de0802907aee66b..74d5329d5cbc376207ae2e527b051c5202fa4f79 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -199,13 +199,15 @@ sub handler {
 
                my @files = ();
                while (my $ref = $q->fetchrow_hashref()) {
-                       push @files, [ $ref->{'event'}, $ref->{'filename'} ];
+                       my $width = defined($ref->{'width'}) ? $ref->{'width'} : -1;
+                       my $height = defined($ref->{'height'}) ? $ref->{'height'} : -1;
+                       push @files, [ $ref->{'event'}, $ref->{'filename'}, $width, $height ];
                }
                
                for my $i (0..$#files) {
-                       $r->print("        [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]");
-                       $r->print(",") unless ($i == $#files);
-                       $r->print("\n");
+                       my $line = sprintf "        [ \"%s\", \"%s\", %d, %d ]", @{$files[$i]};
+                       $line .= "," unless ($i == $#files);
+                       $r->print($line . "\n");
                }
 
                my %settings_no_fullscreen = %settings;
@@ -335,9 +337,11 @@ sub handler {
                                $day = ", " . $ref->{'day'};
                        }
 
-                       if ($day ne $lastupl) {
+                       my $groupkey = $takenby . $day;
+
+                       if ($groupkey ne $lastupl) {
                                $r->print("    </p>\n\n") if ($lastupl ne "" && $rot != 1);
-                               $lastupl = $day;
+                               $lastupl = $groupkey;
 
                                my %newsettings = %settings;
 
@@ -355,7 +359,7 @@ sub handler {
                                my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
                                
                                $r->print("    <h2>");
-                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day });
+                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $takenby, action => $action, filterurl => $url, date => $day });
                                print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                $r->print("</h2>\n");
 
@@ -364,7 +368,7 @@ sub handler {
                                }
                        }
 
-                       if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
+                       if (defined($ref->{'width'}) && defined($ref->{'height'})) {
                                my $width = $ref->{'width'};
                                my $height = $ref->{'height'};
                                        
@@ -478,7 +482,7 @@ sub print_thumbsize {
 }
 sub print_viewres {
        my ($r, $event, $settings, $defsettings) = @_;
-       my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960);
+       my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960 1400x1050 1600x1200);
        chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited'));
        chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original'));
        push @alternatives, [ $unlimited, undef, undef ];