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

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index fab7971..3079455 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -57,14 +57,15 @@ sub handler {
 		xres => -1,
 		yres => -1,
 		start => 1,
-		num => 100,
+		num => 250,
 		all => 1,
 		infobox => 1,
 		rot => 0,
 		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,34 @@ 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("    </p>\n\n") if ($lastupl ne "" && $rot != 1);
-				$lastupl = $takenby;
+				$lastupl = $groupkey;
+
+				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 => $takenby, action => $action, filterurl => $url, date => $day });
 				print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
 				$r->print("</h2>\n");
 
@@ -452,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 ];
@@ -471,7 +499,7 @@ sub print_pagelimit {
 	
 	# Get choices
 	chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited'));
-	my @alternatives = qw(10 50 100 500);
+	my @alternatives = qw(10 50 100 250 500);
 	push @alternatives, $unlimited;
 	
 	for my $num (@alternatives) {
@@ -640,9 +668,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;