Add a new 2304x1728 resolution (twice 1152x864), for fitting better into 30-inch...

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

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index c2d9dbc93ddefb1dc155b9f2ad76bd023c39cd57..0372c46bb7416d7b17b4561dccbd64283530e2cb 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -6,8 +6,6 @@ use Sesse::pr0n::Rotate;
 use Sesse::pr0n::Select;
 use Sesse::pr0n::WebDAV;
 use Sesse::pr0n::NewEvent;
-use Sesse::pr0n::Registry;
-use Sesse::pr0n::Wizard;
 
 package Sesse::pr0n::pr0n;
 use strict;    
@@ -17,7 +15,7 @@ sub handler {
        my $r = shift;
 
        my $uri = $r->uri;
-       if ($uri eq '/' || $uri eq '/+tags' || $uri eq '/+tags/') {
+       if ($uri eq '/' || $uri =~ /^\/\+tags\/?$/) {
                return Sesse::pr0n::Listing::handler($r);
        } elsif ($uri eq '/robots.txt' ||
                 $uri eq '/pr0n.css' ||
@@ -25,6 +23,7 @@ sub handler {
                 $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' ||
@@ -63,14 +62,11 @@ sub handler {
                return Sesse::pr0n::Select::handler($r);
        } elsif ($uri =~ m#^/newevent$#) {
                return Sesse::pr0n::NewEvent::handler($r);
-       } elsif ($uri =~ m#^/registry$#) {
-               return Sesse::pr0n::Registry::handler($r);
-       } elsif ($uri =~ m#^/wizard$#) {
-               return Sesse::pr0n::Wizard::handler($r);
-       } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/?$# ||
-                $uri =~ m#^/\+all/?$#) {
+       } elsif ($uri =~ /^\/[a-zA-Z0-9-]+\/?$/ ||
+                $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/)?((?:no)?box/)?[a-zA-Z0-9._()-]+$#) {
                return Sesse::pr0n::Image::handler($r);
        }