my $apr = Apache2::Request->new($r);
my $dbh = Sesse::pr0n::Common::get_dbh();
- my ($event, $abspath);
+ my ($event, $abspath, $datesort);
if ($r->uri =~ /^\/\+all\/?/) {
$event = '+all';
$abspath = 1;
+
+ # augh, this needs 8.3, so we'll have to fiddle around a bit instead
+ # $datesort = 'DESC NULLS LAST';
+ $datesort = 'DESC';
} else {
# Find the event
$r->uri =~ /^\/([a-zA-Z0-9-]+)\/?$/
or error($r, "Could not extract event");
$event = $1;
$abspath = 0;
+ $datesort = 'ASC';
}
# Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
# 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 (date - INTERVAL '6 hours')::date,takenby,date,filename $limit")
+ 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")
or dberror($r, "prepare()");
$q->execute($r->get_server_name)
or dberror($r, "image enumeration");
$r->content_type("text/html; charset=utf-8");
Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
while (my $ref = $q->fetchrow_hashref()) {
- $r->print(" \"" . $infobox . $ref->{'filename'} . "\",\n");
+ $r->print(" [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
}
my %settings_no_fullscreen = %settings;
Sesse::pr0n::Templates::print_template($r, "fullscreen-footer", {
vhost => $r->get_server_name,
- event => $event,
start => $settings{'start'} - 1,
returnurl => $returnurl,
sel => $settings{'sel'},
+ infobox => $infobox
});
} else {
Sesse::pr0n::Common::header($r, "$name [$event]");