Improve flash/no flash detection.

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

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 620bf19eba245d3c8287f2cb8f2ae4daf630b4d3..79bd3c8fc3028cbf2fab66a7e7f3b86f4c8bd901 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -2,7 +2,6 @@ use Sesse::pr0n::Common;
 use Sesse::pr0n::Listing;
 use Sesse::pr0n::Index;
 use Sesse::pr0n::Image;
-use Sesse::pr0n::Single;
 use Sesse::pr0n::Rotate;
 use Sesse::pr0n::Select;
 use Sesse::pr0n::WebDAV;
@@ -37,8 +36,6 @@ sub handler {
        } elsif ($uri =~ m#^/usage/([a-zA-Z0-9.-]+)$#) {
                $r->sendfile(Sesse::pr0n::Common::get_base($r) . "usage/$1");
                return Apache2::Const::OK;
-       } elsif ($uri =~ m#^/single/?$#) {
-               return Sesse::pr0n::Single::handler($r);
        } elsif ($uri =~ m#^/rotate$#) {
                return Sesse::pr0n::Rotate::handler($r);
        } elsif ($uri =~ m#^/select$#) {
@@ -47,7 +44,7 @@ sub handler {
                return Sesse::pr0n::NewEvent::handler($r);
        } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/?$#) {
                return Sesse::pr0n::Index::handler($r);
-       } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/(\d+x\d+/)?(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);
        }