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");
print_viewres($r, $event, \%settings, \%defsettings);
print_pagelimit($r, $event, \%settings, \%defsettings);
print_infobox($r, $event, \%settings, \%defsettings);
- print_nextprev($r, $event, \%settings, \%defsettings);
print_selected($r, $event, \%settings, \%defsettings) if ($num_selected > 0);
print_fullscreen($r, $event, \%settings, \%defsettings);
+ print_nextprev($r, $event, \%settings, \%defsettings);
# Find the equipment used
- my $eq = $dbh->prepare('
+ my $eq = $dbh->prepare("
SELECT
- model.value AS model,
- coalesce(lens_spec.value, lens.value) AS lens,
+ TRIM(model.value) AS model,
+ coalesce(TRIM(lens_spec.value), TRIM(lens.value)) AS lens,
COUNT(*) AS num
- FROM images i
+ FROM ( SELECT * FROM images WHERE event=? $where ORDER BY (date - INTERVAL '6 hours')::date,takenby,date,filename $limit ) i
LEFT JOIN exif_info model ON i.id=model.image
- LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'Lens\' ) lens ON i.id=lens.image
- LEFT JOIN ( SELECT * FROM exif_info WHERE tag=\'LensSpec\') lens_spec ON i.id=lens_spec.image
- WHERE event=? AND model.tag=\'Model\'
+ LEFT JOIN ( SELECT * FROM exif_info WHERE tag='Lens' ) lens ON i.id=lens.image
+ LEFT JOIN ( SELECT * FROM exif_info WHERE tag='LensSpec') lens_spec ON i.id=lens_spec.image
+ WHERE model.tag='Model'
GROUP BY 1,2
- ORDER BY 1,2')
+ ORDER BY 1,2")
or die "Couldn't prepare to find equipment: $!";
$eq->execute($event)
or die "Couldn't find equipment: $!";
my $toclose = 0;
my $lastupl = "";
+ my $img_num = $start;
# Print out all thumbnails
if ($rot == 1) {
$r->print(" <form method=\"post\" action=\"/rotate\">\n");
$r->print(" <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-
+
while (my $ref = $q->fetchrow_hashref()) {
my $imgsz = "";
my $takenby = $ref->{'takenby'};
if ($takenby ne $lastupl) {
$lastupl = $takenby;
+ $r->print(" <h2>");
Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
$ref->{'id'} . "-270\" />\n");
$r->print(" " .
" Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
+
+ ++$img_num;
}
$r->print(" <input type=\"submit\" value=\"Rotate\" />\n");
$r->print(" </form>\n");
- } elsif ($sel == 1) {
- $r->print(" <form method=\"post\" action=\"/select\">\n");
- $r->print(" <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-
- while (my $ref = $q->fetchrow_hashref()) {
- my $imgsz = "";
- my $takenby = $ref->{'takenby'};
- if (defined($ref->{'day'})) {
- $takenby .= ", " . $ref->{'day'};
- }
-
- if ($takenby ne $lastupl) {
- $lastupl = $takenby;
- Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
- }
- if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
- my $width = $ref->{'width'};
- my $height = $ref->{'height'};
-
- ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres);
- $imgsz = " width=\"$width\" height=\"$height\"";
- }
-
- my $filename = $ref->{'filename'};
- my $uri = $infobox . $filename;
- if (defined($xres) && defined($yres) && $xres != -1) {
- $uri = "${xres}x$yres/$infobox$filename";
- } elsif (defined($xres) && $xres == -1) {
- $uri = "original/$infobox$filename";
- }
-
- my $selected = $ref->{'selected'} ? ' checked="checked"' : '';
-
- $r->print(" <p><a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
- $r->print(" <input type=\"checkbox\" name=\"sel-" .
- $ref->{'id'} . "\"$selected /></p>\n");
- }
- $r->print(" <input type=\"submit\" value=\"Select\" />\n");
- $r->print(" </form>\n");
} else {
while (my $ref = $q->fetchrow_hashref()) {
my $imgsz = "";
if ($takenby ne $lastupl) {
$r->print(" </p>\n\n") if ($lastupl ne "");
$lastupl = $takenby;
+ $r->print(" <h2>");
Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
- $r->print(" <p>\n");
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
+ $r->print(" <p class=\"photos\">\n");
}
if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
my $width = $ref->{'width'};
}
$r->print(" <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+
+ ++$img_num;
}
$r->print(" </p>\n");
}
my ($r, $event, $settings, $defsettings) = @_;
my $start = $settings->{'start'};
my $num = $settings->{'num'};
+ my $all = $settings->{'all'};
my $dbh = Sesse::pr0n::Common::get_dbh();
+ my $where = ($all == 0) ? ' AND selected=\'t\'' : '';
$num = undef if (defined($num) && $num == -1);
return unless (defined($start) && defined($num));
# determine total number
- my $ref = $dbh->selectrow_hashref('SELECT count(*) AS num_images FROM images WHERE event=?',
+ my $ref = $dbh->selectrow_hashref("SELECT count(*) AS num_images FROM images WHERE event=? $where",
undef, $event)
or dberror($r, "image enumeration");
my $num_images = $ref->{'num_images'};
$end = $num_images;
}
- $r->print(" <p>\n");
+ $r->print(" <p class=\"nextprev\">\n");
# Previous
if ($start > 1) {
Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
$r->print("</p>\n");
}
+
+sub print_fullscreen_fromhere {
+ my ($r, $event, $settings, $defsettings, $start) = @_;
+
+ chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen-fromhere'));
+
+ my %newsettings = %$settings;
+ $newsettings{'fullscreen'} = 1;
+ $newsettings{'start'} = $start;
+
+ $r->print(" <p class=\"fsfromhere\">");
+ Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
+ $r->print("</p>\n");
+}
1;
projects / pr0n / blobdiff