Actually implement filtering.

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

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 1395168f224a7f8e209305e5c334c315085fffe2..a0c682bcfafac2e5882e8ccff5d62256810acf6f 100644 (file)
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -6,6 +6,8 @@ use Sesse::pr0n::Rotate;
 use Sesse::pr0n::Select;
 use Sesse::pr0n::WebDAV;
 use Sesse::pr0n::NewEvent;
+use Sesse::pr0n::Registry;
+use Sesse::pr0n::Wizard;
 
 package Sesse::pr0n::pr0n;
 use strict;    
@@ -27,6 +29,9 @@ 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 =~ m#^/usage/([a-zA-Z0-9_.]+)$#) {
                $uri =~ s#^/##;
                my $fname = Sesse::pr0n::Common::get_base($r) . 'files/' . $uri;
@@ -37,7 +42,7 @@ sub handler {
                $r->set_content_length($size);  
                $r->set_last_modified($mtime);
 
-               if((my $rc = $r->meets_conditions) != OK) {
+               if((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
                        return $rc;
                }
 
@@ -58,7 +63,12 @@ sub handler {
                return Sesse::pr0n::Select::handler($r);
        } elsif ($uri =~ m#^/newevent$#) {
                return Sesse::pr0n::NewEvent::handler($r);
-       } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/?$#) {
+       } elsif ($uri =~ m#^/registry$#) {
+               return Sesse::pr0n::Registry::handler($r);
+       } elsif ($uri =~ m#^/wizard$#) {
+               return Sesse::pr0n::Wizard::handler($r);
+       } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/?$# ||
+                $uri =~ m#^/\+all/?$#) {
                return Sesse::pr0n::Index::handler($r);
        } elsif ($uri =~ m#^/[a-zA-Z0-9-]+/(\d+x\d+/|original/)?(nobox/)?[a-zA-Z0-9._-]+$#) {
                return Sesse::pr0n::Image::handler($r);