X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=f12a15891792ed1ba0e195e815c4c157df2d1b29;hp=4a7160381d03100391486bd9150ad2fe919eb2a3;hb=6c8c4bf3f1e3109523f9ec6117abfdf0e04a0d99;hpb=eac2adad0a49c50b3db6f96c3bd799e3ca2b8d24 diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm index 4a71603..f12a158 100644 --- a/perl/Sesse/pr0n/Image.pm +++ b/perl/Sesse/pr0n/Image.pm @@ -42,10 +42,18 @@ sub handler { #} else { # Look it up in the database - my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND vhost=? AND filename=?', + my $ref = $dbh->selectrow_hashref('SELECT id,render_id,width,height FROM images WHERE event=? AND vhost=? AND filename=?', undef, $event, Sesse::pr0n::Common::get_server_name($r), $filename); return error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref)); + if (defined($xres) && defined($yres) && defined($ref->{'render_id'}) && !$infobox) { + # We have a render, we're not asked for the original, and we do not have infobox. + $ref = $dbh->selectrow_hashref('SELECT id,filename,width,height FROM images WHERE id=?', + undef, $ref->{'render_id'}); + return error($r, "Could not find render of $event/$filename", 404, "File not found") unless (defined($ref)); + $filename = $ref->{'filename'}; + } + $id = $ref->{'id'}; $dbwidth = $ref->{'width'}; $dbheight = $ref->{'height'};