Minor code cleanup.

[pr0n] / perl / Sesse / pr0n / Index.pm

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 819d5af71e262f14ca0647d316aa0b745d321f37..c13b135c61136534f1b3615f40cb44fdfdcde662 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -100,16 +100,11 @@ sub handler {
        my $num_selected = $ref->{'num_selected'};
 
        # Find all images related to this event.
-       my $q;
        my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
+       my $limit = (defined($start) && defined($num) && !$settings{'fullscreen'}) ? (" LIMIT $num OFFSET " . ($start-1)) : "";
 
-       if (defined($start) && defined($num) && !$settings{'fullscreen'}) {
-               $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename LIMIT $num OFFSET " . ($start-1))
-                       or dberror($r, "prepare()");
-       } else {
-               $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename")
-                       or dberror($r, "prepare()");
-       }
+       my $q = $dbh->prepare("SELECT *, (date - INTERVAL '6 hours')::date AS day FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit"
+               or dberror($r, "prepare()");
        $q->execute($event)
                or dberror($r, "image enumeration");