From 7ed166d00c60530874566d5e67130464e6fc0415 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 26 Jul 2007 02:13:38 +0200 Subject: [PATCH 1/1] Allow () in filenames. --- perl/Sesse/pr0n/Image.pm | 6 +++--- perl/Sesse/pr0n/pr0n.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm index 7f3e3c0..23b7d1b 100644 --- a/perl/Sesse/pr0n/Image.pm +++ b/perl/Sesse/pr0n/Image.pm @@ -16,16 +16,16 @@ sub handler { # Find the event and file name my ($event,$filename,$xres,$yres); my $infobox = 1; - if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._-]+)$#) { + if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._()-]+)$#) { $event = $1; $filename = $3; - } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) { + } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._()-]+)$#) { $event = $1; $filename = $5; $xres = $2; $yres = $3; $infobox = 0 if (defined($4)); - } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._-]+)$#) { + } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._()-]+)$#) { $event = $1; $filename = $3; $xres = -1; diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm index b730aca..b65ccf0 100644 --- a/perl/Sesse/pr0n/pr0n.pm +++ b/perl/Sesse/pr0n/pr0n.pm @@ -71,7 +71,7 @@ sub handler { $uri =~ /^\/\+all\/?$/ || $uri =~ /^\/\+tags\/[a-zA-Z0-9-]+\/?$/) { return Sesse::pr0n::Index::handler($r); - } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/(\d+x\d+/|original/)?(nobox/)?[a-zA-Z0-9._-]+$#) { + } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/(\d+x\d+/|original/)?(nobox/)?[a-zA-Z0-9._()-]+$#) { return Sesse::pr0n::Image::handler($r); } -- 2.39.2