X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2Fpr0n.pm;h=487a01a1398827cfb86e1e49ecf567c962ff00df;hp=620bf19eba245d3c8287f2cb8f2ae4daf630b4d3;hb=84b16cfb3e4428c4b07dddd8e4c5aa1f2aa1b6d7;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm index 620bf19..487a01a 100644 --- 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; @@ -23,6 +22,10 @@ sub handler { $uri eq '/skoyen.css' || $uri eq '/blah.png' || $uri eq '/faq.html' || + $uri eq '/pr0n-fullscreen.css' || + $uri eq '/pr0n-fullscreen.js' || + $uri eq '/previous.png' || + $uri eq '/next.png' || $uri =~ m#^/usage/([a-zA-Z0-9_.]+)$#) { $uri =~ s#^/##; $r->content_type(Sesse::pr0n::Common::get_mimetype_from_filename($uri)); @@ -37,8 +40,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 +48,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); }