X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2Fpr0n.pm;h=28df8719a04ecebabfbe8283ae7e89de6622e7e9;hp=620bf19eba245d3c8287f2cb8f2ae4daf630b4d3;hb=97587692088c0aebc302164e335817f5dfedc49f;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 620bf19..28df871 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,22 +22,25 @@ 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 eq '/close.png' ||
 		 $uri =~ m#^/usage/([a-zA-Z0-9_.]+)$#) {
 		$uri =~ s#^/##;
 		$r->content_type(Sesse::pr0n::Common::get_mimetype_from_filename($uri));
-		$r->sendfile(Sesse::pr0n::Common::get_base($r) . $uri);
+		$r->sendfile(Sesse::pr0n::Common::get_base($r) . 'files/' . $uri);
 		return Apache2::Const::OK;
 	} elsif ($uri eq '/newevent.html') {
 		$r->content_type('text/html; charset=utf-8');
-		$r->sendfile(Sesse::pr0n::Common::get_base($r) . "newevent.html");
+		$r->sendfile(Sesse::pr0n::Common::get_base($r) . "files/newevent.html");
 		return Apache2::Const::OK;
 	} elsif ($uri =~ m#^/webdav#) {
 		return Sesse::pr0n::WebDAV::handler($r);
 	} 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 +49,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);
 	}