Fix original/nobox/.

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 6df8ea25e29509a643ef829120f110c59dffea32..e436428950b6adc9d5a8e56e23755d3eab4ae710 100644 (file)
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -16,9 +16,9 @@ sub handler {
        # Find the event and file name
        my ($event,$filename,$xres,$yres);
        my $infobox = 1;
        # Find the event and file name
        my ($event,$filename,$xres,$yres);
        my $infobox = 1;

-       if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/([a-zA-Z0-9._-]+)$#) {
+       if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._-]+)$#) {

                $event = $1;
                $event = $1;

-               $filename = $2;
+               $filename = $3;

        } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
                $event = $1;
                $filename = $5;
        } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
                $event = $1;
                $filename = $5;