X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=fab7971956a166bf54f4ed5431c727bc08f0e2df;hp=b5e0d113a277902caf3f3360d2989ed8aac9108c;hb=ec14c563960e82427aa290a9c66d217cbcb9274a;hpb=3f99d49ca970b297eb6fdd930718e9a796729217 diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm index b5e0d11..fab7971 100644 --- a/perl/Sesse/pr0n/Index.pm +++ b/perl/Sesse/pr0n/Index.pm @@ -98,8 +98,7 @@ sub handler { $settings{$s} = $val; } if ($s eq "model" || $s eq "lens") { - $val =~ s/_/ /g; - $settings{$s} = $val; + $settings{$s} = Sesse::pr0n::Common::pretty_unescape($val); } } @@ -317,43 +316,57 @@ 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("
\n"); }