X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;fp=perl%2FSesse%2Fpr0n%2FImage.pm;h=6df8ea25e29509a643ef829120f110c59dffea32;hb=576c411da9608bb7155e89811694f9f19e542773;hp=30bf73647fc4cbaee00cd970ac3f6116aaedea45;hpb=ff3856b866fcbf52850d7c92a270825de3126b26;p=pr0n diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm index 30bf736..6df8ea2 100644 --- a/perl/Sesse/pr0n/Image.pm +++ b/perl/Sesse/pr0n/Image.pm @@ -16,7 +16,7 @@ sub handler { # Find the event and file name my ($event,$filename,$xres,$yres); my $infobox = 1; - if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/([a-zA-Z0-9._-]+)$#) { + if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/([a-zA-Z0-9._-]+)$#) { $event = $1; $filename = $2; } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) { @@ -25,6 +25,12 @@ sub handler { $xres = $2; $yres = $3; $infobox = 0 if (defined($4)); + } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._-]+)$#) { + $event = $1; + $filename = $3; + $xres = -1; + $yres = -1; + $infobox = 0 if (defined($2)); } my ($id, $dbwidth, $dbheight);