X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=2c93c7c55c93bd930d71828759558ca33fc608e3;hb=a58f1ab4dd5b224b12ed78096b6867f47c316231;hp=809bda651d9e6ad60f439948ebd7ccfe7f1ebdb6;hpb=dfb798a13cc5b66c50aef55596b3862d0c6d60ab;p=pr0n diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index 809bda6..2c93c7c 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -57,7 +57,7 @@ sub handler { xres => -1, yres => -1, start => 1, - num => 100, + num => 250, all => 1, infobox => 1, rot => 0, @@ -199,13 +199,13 @@ sub handler { my @files = (); while (my $ref = $q->fetchrow_hashref()) { - push @files, [ $ref->{'event'}, $ref->{'filename'} ]; + push @files, [ $ref->{'event'}, $ref->{'filename'}, $ref->{'width'}, $ref->{'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; @@ -296,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); @@ -328,13 +330,16 @@ 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) { + my $groupkey = $takenby . $day; + + if ($groupkey ne $lastupl) { $r->print("
\n\n") if ($lastupl ne "" && $rot != 1); - $lastupl = $takenby; + $lastupl = $groupkey; my %newsettings = %settings; @@ -342,15 +347,17 @@ sub handler { 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(""); + $r->print(" "); Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); - $r->print("
\n"); + $r->print("\n"); } 1;