X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=d070ba157f7298393c365b414fda965075cd3197;hb=7862de1a0f4f9a610c81356175c099c00ebc2000;hp=b5e0d113a277902caf3f3360d2989ed8aac9108c;hpb=3f99d49ca970b297eb6fdd930718e9a796729217;p=pr0n diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index b5e0d11..d070ba1 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -57,14 +57,15 @@ sub handler { 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; @@ -89,7 +90,7 @@ sub handler { 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; @@ -97,9 +98,8 @@ sub handler { 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); } } @@ -115,6 +115,7 @@ sub handler { my $sel = $settings{'sel'}; my $model = $settings{'model'}; my $lens = $settings{'lens'}; + my $author = $settings{'author'}; # Construct SQL for this filter if ($all == 0) { @@ -139,6 +140,11 @@ sub handler { $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; @@ -290,10 +296,12 @@ sub handler { 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); @@ -317,43 +325,74 @@ sub handler { if ($rot == 1) { $r->print("
\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(" \n\n") if ($lastupl ne ""); - $lastupl = $takenby; - $r->print("\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(" \n");
-
- ++$img_num;
- }
$r->print("
"); + $r->print(" "); Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings); - $r->print("
\n"); + $r->print("\n"); } 1;