X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=30794557e868b2d4de43aa1b0927f63bd61fba06;hp=239c4b9d8f612a3ff753ecad0de0802907aee66b;hb=29546c334313d9ade7fd708b04f86c567696d471;hpb=0d622d1cdc55f091b7d4219b2763fac7902fbd53

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 239c4b9..3079455 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -335,9 +335,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 +357,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");
 
@@ -478,7 +480,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 ];