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;
$day = ", " . $ref->{'day'};
}
- if ($takenby ne $lastupl) {
+ my $groupkey = $takenby . $day;
+
+ if ($groupkey ne $lastupl) {
$r->print(" </p>\n\n") if ($lastupl ne "" && $rot != 1);
- $lastupl = $takenby;
+ $lastupl = $groupkey;
my %newsettings = %settings;
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");
}
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 ];