X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2Fpr0n.pm;h=f5715f53b7077b9f7d5b30831f7915ff75aecb79;hp=bddfe223e2192e884db28e34392c7ce77c216ebb;hb=3d40b6487a2276c403022a1534eb943a5374ebc5;hpb=09260885c52013320acd21d7ce262e12def7301f

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index bddfe22..f5715f5 100644
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -16,12 +16,11 @@ sub handler {
 	my $r = shift;
 
 	my $uri = $r->path_info;
-	if ($uri eq '/' || $uri =~ /^\/\+tags\/?$/) {
+	if ($uri eq '/') {
 		return Sesse::pr0n::Listing::handler($r);
 	} elsif ($uri eq '/robots.txt' ||
 		 $uri eq '/pr0n.css' ||
 		 $uri eq '/skoyen.css' ||
-		 $uri eq '/blah.png' ||
 		 $uri eq '/faq.html' ||
 		 $uri eq '/pr0n-fullscreen.css' ||
 		 $uri eq '/pr0n-fullscreen-ie.css' ||
@@ -29,9 +28,7 @@ sub handler {
 		 $uri eq '/previous.png' ||
 		 $uri eq '/next.png' ||
 		 $uri eq '/close.png' ||
-		 $uri eq '/wizard.js' ||
-		 $uri eq '/wizard.css' ||
-		 $uri eq '/pr0n.ico' ||
+		 $uri eq '/options.png' ||
 		 $uri =~ m#^/usage/([a-zA-Z0-9_.]+)$#) {
 		$uri =~ s#^/##;
 		my $fname = $Sesse::pr0n::Config::image_base . 'files/' . $uri;
@@ -67,10 +64,12 @@ sub handler {
 	} elsif ($uri =~ m#^/newevent$#) {
 		return Sesse::pr0n::NewEvent::handler($r);
 	} elsif ($uri =~ /^\/[a-zA-Z0-9-]+\/?$/ ||
-		 $uri =~ /^\/\+all\/?$/ ||
-		 $uri =~ /^\/\+tags\/[a-zA-Z0-9-]+\/?$/) {
+		 $uri =~ /^\/\+all\/?$/) {
 		return Sesse::pr0n::Index::handler($r);
-	} elsif ($uri =~ m#^/[a-zA-Z0-9-]+/(\d+x\d+(\@\d+(\.\d+)?)?/|original/)((?:no)?box/)?[a-zA-Z0-9._()-]+$#) {
+	} elsif ($uri =~ m#^/[a-zA-Z0-9-]+/
+		           (\d+x\d+ ( \@\d+(\.\d+)? )? / | original/ )?
+                           ((?:no)?box/)?
+                           [a-zA-Z0-9._()-]+$#x) {
 		return Sesse::pr0n::Image::handler($r);
 	}