xres => -1,
yres => -1,
start => 1,
- num => 100,
+ num => 250,
all => 1,
infobox => 1,
rot => 0,
sel => 0,
fullscreen => 0,
model => undef,
- lens => undef
+ lens => undef,
+ author => undef
);
my $where;
my %settings = %defsettings;
- for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens) {
+ for my $s qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author) {
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") {
- $val =~ s/_/ /g;
- $settings{$s} = $val;
+ if ($s eq "model" || $s eq "lens" || $s eq "author") {
+ $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val);
}
}
my $sel = $settings{'sel'};
my $model = $settings{'model'};
my $lens = $settings{'lens'};
+ my $author = $settings{'author'};
# Construct SQL for this filter
if ($all == 0) {
$where .= " AND id IN ( SELECT image FROM exif_info WHERE (key='Lens' OR key='LensSpec') AND TRIM(value)=$lq )";
}
}
+ if (defined($author)) {
+ my $aq = $dbh->quote($author);
+
+ $where .= " AND takenby=$aq";
+ }
if (defined($num) && $num == -1) {
$num = undef;
chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
$newsettings{'model'} = undef;
$newsettings{'lens'} = undef;
+ $newsettings{'start'} = 1;
} else {
chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
$newsettings{'model'} = $e->{'model'};
$newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+ $newsettings{'start'} = 1;
}
my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
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'};
+ my $day = '';
+ if (defined($ref->{'day'})) {
+ $day = ", " . $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;
+
+ my %newsettings = %settings;
+
+ my $action;
+ if (defined($author)) {
+ chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
+ $newsettings{'author'} = undef;
+ $newsettings{'start'} = 1;
+ } else {
+ chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
+ $newsettings{'author'} = $ref->{'takenby'};
+ $newsettings{'start'} = 1;
}
- my $prefix = "";
- if ($abspath) {
- $prefix = "/" . $ref->{'event'} . "/";
+ my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
+
+ $r->print(" <h2>");
+ Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day });
+ print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+ $r->print("</h2>\n");
+
+ if ($rot != 1) {
+ $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\"";
+ }
- $r->print(" <p><a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+ 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");
}
# Get choices
chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'imgsperpage-unlimited'));
- my @alternatives = qw(10 50 100 500);
+ my @alternatives = qw(10 50 100 250 500);
push @alternatives, $unlimited;
for my $num (@alternatives) {
$newsettings{'fullscreen'} = 1;
$newsettings{'start'} = $start;
- $r->print(" <p class=\"fsfromhere\">");
+ $r->print(" <span class=\"fsfromhere\">");
Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
- $r->print("</p>\n");
+ $r->print("</span>\n");
}
1;