Fix some Perl deprecation warnings. Patches from xim.

[pr0n] / perl / Sesse / pr0n / pr0n.pm

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 55e64de907e983be97ef2e4edb49e3be5cd07053..eeb93b0a7aa544df4b88db2e350a6d24e9ec4e04 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -17,7 +17,7 @@ sub handler {
        my $r = shift;
 
        my $uri = $r->uri;
        my $r = shift;
 
        my $uri = $r->uri;

-       if ($uri eq '/') {
+       if ($uri eq '/' || $uri =~ /^\/\+tags\/?$/) {

                return Sesse::pr0n::Listing::handler($r);
        } elsif ($uri eq '/robots.txt' ||
                 $uri eq '/pr0n.css' ||
                return Sesse::pr0n::Listing::handler($r);
        } elsif ($uri eq '/robots.txt' ||
                 $uri eq '/pr0n.css' ||


@@ -25,6 +25,7 @@ sub handler {
                 $uri eq '/blah.png' ||
                 $uri eq '/faq.html' ||
                 $uri eq '/pr0n-fullscreen.css' ||
                 $uri eq '/blah.png' ||
                 $uri eq '/faq.html' ||
                 $uri eq '/pr0n-fullscreen.css' ||

+                $uri eq '/pr0n-fullscreen-ie.css' ||

                 $uri eq '/pr0n-fullscreen.js' ||
                 $uri eq '/previous.png' ||
                 $uri eq '/next.png' ||
                 $uri eq '/pr0n-fullscreen.js' ||
                 $uri eq '/previous.png' ||
                 $uri eq '/next.png' ||


@@ -67,9 +68,11 @@ sub handler {
                return Sesse::pr0n::Registry::handler($r);
        } elsif ($uri =~ m#^/wizard$#) {
                return Sesse::pr0n::Wizard::handler($r);
                return Sesse::pr0n::Registry::handler($r);
        } elsif ($uri =~ m#^/wizard$#) {
                return Sesse::pr0n::Wizard::handler($r);

-       } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/?$#) {
+       } elsif ($uri =~ /^\/[a-zA-Z0-9-]+\/?$/ ||
+                $uri =~ /^\/\+all\/?$/ ||
+                $uri =~ /^\/\+tags\/[a-zA-Z0-9-]+\/?$/) {

                return Sesse::pr0n::Index::handler($r);
                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/)?((?:no)?box/)?[a-zA-Z0-9._()-]+$#) {

                return Sesse::pr0n::Image::handler($r);
        }
 
                return Sesse::pr0n::Image::handler($r);
        }