X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=08491bb775830224f4e99a2d281c46a0276e0853;hp=8bd8aba7f57871ab8e5c4ba7089c2357ff860d03;hb=690d93241d826e733ac20868208a0bee2134ee11;hpb=22343b9dbe45470693d2d58b4ebdc7375bd455d3

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 8bd8aba..08491bb 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -17,15 +17,13 @@ sub handler {
 		$abspath = 1;
 		$tag = undef; 
 
-		# augh, this needs 8.3, so we'll have to fiddle around a bit instead
-		# $datesort = 'DESC NULLS LAST';
-		$datesort = 'DESC';
+		$datesort = 'DESC NULLS LAST';
 	} elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) {
 		$tag = $1;
 		$event = "+tags/$tag";
 		$abspath = 1;
 		
-		$datesort = 'DESC';
+		$datesort = 'DESC NULLS LAST';
 	} else {
 		# Find the event
 		$r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/
@@ -33,7 +31,7 @@ sub handler {
 		$event = $1;
 		$abspath = 0;
 		$tag = undef;
-		$datesort = 'ASC';
+		$datesort = 'ASC NULLS LAST';
 	}
 
 	# Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
@@ -180,7 +178,7 @@ sub handler {
 	# Find all images related to this event.
 	my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-	my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY COALESCE((date - INTERVAL '6 hours')::date, '1970-01-01') $datesort,takenby,date,filename $limit")
+	my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE vhost=? $where ORDER BY (date - INTERVAL '6 hours')::date $datesort,takenby,date,filename $limit")
 		or dberror($r, "prepare()");
 	$q->execute($r->get_server_name)
 		or dberror($r, "image enumeration");
@@ -214,14 +212,14 @@ sub handler {
 
 		my $returnurl = "http://" . $r->get_server_name . "/" . $event . "/" .
 			Sesse::pr0n::Common::get_query_string(\%settings_no_fullscreen, \%defsettings);
-
+		
 		# *whistle*
 		$returnurl =~ s/&/&/g;
 
 		Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
 			vhost => $r->get_server_name,
-			start => $settings{'start'} - 1,
 			returnurl => $returnurl,
+			start => $settings{'start'} - 1,
 			sel => $settings{'sel'},
 			infobox => $infobox
 		});
@@ -478,7 +476,7 @@ sub print_thumbsize {
 }
 sub print_viewres {
 	my ($r, $event, $settings, $defsettings) = @_;
-	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1280x960 1400x1050 1600x1200);
+	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536);
 	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 ];