my $apr = Apache2::Request->new($r);
my $dbh = Sesse::pr0n::Common::get_dbh();
- my ($event, $abspath, $datesort);
+ my ($event, $abspath, $datesort, $tag);
if ($r->uri =~ /^\/\+all\/?/) {
$event = '+all';
$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';
+ } elsif ($r->uri =~ /^\/\+tags\/([a-zA-Z0-9-]+)\/?$/) {
+ $tag = $1;
+ $event = "+tags/$tag";
+ $abspath = 1;
+
$datesort = 'DESC';
} else {
# Find the event
or error($r, "Could not extract event");
$event = $1;
$abspath = 0;
+ $tag = undef;
$datesort = 'ASC';
}
# Fix common error: pr0n.sesse.net/event -> pr0n.sesse.net/event/
- if ($r->uri !~ m#/$#) {
- $r->headers_out->{'location'} = "/$event/";
+ if ($r->uri !~ /\/$/) {
+ $r->headers_out->{'location'} = $r->uri . "/";
return Apache2::Const::REDIRECT;
}
rot => 0,
sel => 0,
fullscreen => 0,
+ model => undef,
+ lens => undef
);
- # Construct SQL for this filter
my $where;
- if ($event eq '+all') {
+ if (defined($tag)) {
+ my $tq = $dbh->quote($tag);
+ $where = " AND id IN ( SELECT image FROM tags WHERE tag=$tq )";
+ } elsif ($event eq '+all') {
$where = '';
} else {
$where = ' AND event=' . $dbh->quote($event);
my %settings = %defsettings;
- for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen) {
+ for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens) {
my $val = $apr->param($s);
if (defined($val) && $val =~ /^(\d+)$/) {
$settings{$s} = $val;
if (($s eq "num" || $s eq "xres" || $s eq "yres") && defined($val) && $val == -1) {
$settings{$s} = $val;
}
+ if ($s eq "model" || $s eq "lens") {
+ $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
+ }
}
my $thumbxres = $settings{'thumbxres'};
my $infobox = $settings{'infobox'} ? '' : 'nobox/';
my $rot = $settings{'rot'};
my $sel = $settings{'sel'};
-
+ my $model = $settings{'model'};
+ my $lens = $settings{'lens'};
+
+ # Construct SQL for this filter
if ($all == 0) {
$where .= ' AND selected=\'t\'';
}
+ if (defined($model) && defined($lens)) {
+ my $mq = $dbh->quote($model);
+ my $lq = $dbh->quote($lens);
+
+ if ($model eq '') {
+ # no defined model
+ $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)<>'' )";
+ } else {
+ $where .= " AND id IN ( SELECT image FROM exif_info WHERE key='Model' AND TRIM(value)=$mq )";
+ }
+
+ # This doesn't match 1:1 if there's both lens and lensspec, but it should be OK in practice
+ if ($lens eq '') {
+ # no defined lens
+ $where .= " AND id NOT IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)<>'' )";
+ } else {
+ $where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
+ }
+ }
if (defined($num) && $num == -1) {
$num = undef;
my ($date, $name);
- if ($event eq '+all') {
+ if ($event eq '+all' || defined($tag)) {
$ref = $dbh->selectrow_hashref("SELECT EXTRACT(EPOCH FROM MAX(last_update)) AS last_update FROM events WHERE vhost=?",
undef, $r->get_server_name)
or error($r, "Could not list events", 404, "File not found");
$name = Sesse::pr0n::Templates::fetch_template($r, 'all-event-title');
$r->set_last_modified($ref->{'last_update'});
} else {
- $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? $where",
- undef, $r->get_server_name)
+ $ref = $dbh->selectrow_hashref("SELECT name,date,EXTRACT(EPOCH FROM last_update) AS last_update FROM events WHERE vhost=? AND event=?",
+ undef, $r->get_server_name, $event)
or error($r, "Could not find event $event", 404, "File not found");
$date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
# Print the page itself
if ($settings{'fullscreen'}) {
$r->content_type("text/html; charset=utf-8");
- Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+
+ if (defined($tag)) {
+ my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag });
+ Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => $title });
+ } else {
+ Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+ }
+
+ my @files = ();
while (my $ref = $q->fetchrow_hashref()) {
- $r->print(" [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
+ push @files, [ $ref->{'event'}, $ref->{'filename'} ];
+ }
+
+ for my $i (0..$#files) {
+ $r->print(" [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]");
+ $r->print(",") unless ($i == $#files);
+ $r->print("\n");
}
my %settings_no_fullscreen = %settings;
infobox => $infobox
});
} else {
- Sesse::pr0n::Common::header($r, "$name [$event]");
+ if (defined($tag)) {
+ my $title = Sesse::pr0n::Templates::process_template($r, "tag-title", { tag => $tag });
+ Sesse::pr0n::Common::header($r, $title);
+ } else {
+ Sesse::pr0n::Common::header($r, "$name [$event]");
+ }
if (defined($date)) {
Sesse::pr0n::Templates::print_template($r, "date", { date => $date });
}
print_fullscreen($r, $event, \%settings, \%defsettings);
print_nextprev($r, $event, $where, \%settings, \%defsettings);
- if ($event ne '+all') {
+ if (1 || $event ne '+all') {
# Find the equipment used
my $eq = $dbh->prepare("
SELECT
COUNT(*) AS num
FROM ( SELECT * FROM images WHERE vhost=? $where ) 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 model.tag='Model'
+ LEFT JOIN ( SELECT * FROM exif_info WHERE key='Lens' ) lens ON i.id=lens.image
+ LEFT JOIN ( SELECT * FROM exif_info WHERE key='LensSpec') lens_spec ON i.id=lens_spec.image
+ WHERE model.key='Model'
GROUP BY 1,2
ORDER BY 1,2")
or die "Couldn't prepare to find equipment: $!";
for my $e (@equipment) {
my $eqspec = $e->{'model'};
$eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
+ $eqspec = HTML::Entities::encode_entities($eqspec);
+
+ my %newsettings = %settings;
+
+ my $action;
+ if (defined($model) && defined($lens)) {
+ chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
+ $newsettings{'model'} = undef;
+ $newsettings{'lens'} = undef;
+ } else {
+ chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
+ $newsettings{'model'} = $e->{'model'};
+ $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+ }
+
+ my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
# This isn't correct for all languages. Fix if we ever need to care. :-)
if ($e->{'num'} == 1) {
- Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec });
+ Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url, action => $action });
} else {
- Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} });
+ Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action });
}
}
Sesse::pr0n::Templates::print_template($r, "equipment-end");
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 (defined($ref->{'day'})) {
- $takenby .= ", " . $ref->{'day'};
- }
+ }
- 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'};
- my $height = $ref->{'height'};
-
- ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres);
- $imgsz = " width=\"$width\" height=\"$height\"";
- }
+ while (my $ref = $q->fetchrow_hashref()) {
+ my $imgsz = "";
+ my $takenby = $ref->{'takenby'};
+ if (defined($ref->{'day'})) {
+ $takenby .= ", " . $ref->{'day'};
+ }
- 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";
- }
+ if ($takenby ne $lastupl) {
+ $r->print(" </p>\n\n") if ($lastupl ne "" && $rot != 1);
+ $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");
- my $prefix = "";
- if ($abspath) {
- $prefix = "/" . $ref->{'event'} . "/";
+ if ($rot != 1) {
+ $r->print(" <p class=\"photos\">\n");
}
+ }
- $r->print(" <p><a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+ 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 $prefix = "";
+ if ($abspath) {
+ $prefix = "/" . $ref->{'event'} . "/";
+ }
+
+ if ($rot == 1) {
+ $r->print(" <p>");
+ } else {
+ $r->print(" ");
+ }
+ $r->print("<a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+
+ if ($rot == 1) {
$r->print(" 90 <input type=\"checkbox\" name=\"rot-" .
$ref->{'id'} . "-90\" />\n");
$r->print(" 180 <input type=\"checkbox\" name=\"rot-" .
$ref->{'id'} . "-270\" />\n");
$r->print(" " .
" Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
-
- ++$img_num;
}
+
+ ++$img_num;
+ }
+
+ if ($rot == 1) {
$r->print(" <input type=\"submit\" value=\"Rotate\" />\n");
$r->print(" </form>\n");
} else {
- while (my $ref = $q->fetchrow_hashref()) {
- my $imgsz = "";
- my $takenby = $ref->{'takenby'};
- if (defined($ref->{'day'})) {
- $takenby .= ", " . $ref->{'day'};
- }
-
- 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 });
- 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'};
- 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 $prefix = "";
- if ($abspath) {
- $prefix = "/" . $ref->{'event'} . "/";
- }
-
- $r->print(" <a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
-
- ++$img_num;
- }
$r->print(" </p>\n");
}
projects / pr0n / blobdiff