X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2Fpr0n.pm;h=28df8719a04ecebabfbe8283ae7e89de6622e7e9;hp=487a01a1398827cfb86e1e49ecf567c962ff00df;hb=2698077b60939a858ecaaf1ccde01591170f0a2c;hpb=84b16cfb3e4428c4b07dddd8e4c5aa1f2aa1b6d7

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 487a01a..28df871 100644
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -26,14 +26,15 @@ sub handler {
 		 $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);
@@ -48,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+/|original)?(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);
 	}