X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2Fpr0n.pm;h=54e55be8270f43ca12c42f89b262e3d59b91c053;hp=1471074560ad6f355ea80fdbb14c2b8d27020d16;hb=25da24661e8b79a9c5c6f32af3e3ca949e2943a0;hpb=ef46d408f973eb86d59b38edb86232f2998efa5b

diff --git a/perl/Sesse/pr0n/pr0n.pm b/perl/Sesse/pr0n/pr0n.pm
index 1471074..54e55be 100644
--- a/perl/Sesse/pr0n/pr0n.pm
+++ b/perl/Sesse/pr0n/pr0n.pm
@@ -6,6 +6,7 @@ use Sesse::pr0n::Rotate;
 use Sesse::pr0n::Select;
 use Sesse::pr0n::WebDAV;
 use Sesse::pr0n::NewEvent;
+use IO::File::WithPath;
 
 package Sesse::pr0n::pr0n;
 use strict;	
@@ -14,7 +15,7 @@ use warnings;
 sub handler {
 	my $r = shift;
 
-	my $uri = $r->uri;
+	my $uri = $r->path_info;
 	if ($uri eq '/') {
 		return Sesse::pr0n::Listing::handler($r);
 	} elsif ($uri eq '/robots.txt' ||
@@ -23,41 +24,66 @@ sub handler {
 		 $uri eq '/blah.png' ||
 		 $uri eq '/faq.html' ||
 		 $uri eq '/pr0n-fullscreen.css' ||
+		 $uri eq '/pr0n-fullscreen-ie.css' ||
 		 $uri eq '/pr0n-fullscreen.js' ||
 		 $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#^/##;
-		$r->content_type(Sesse::pr0n::Common::get_mimetype_from_filename($uri));
-		$r->sendfile(Sesse::pr0n::Common::get_base($r) . $uri);
-		return Apache2::Const::OK;
+		my $fname = $Sesse::pr0n::Config::image_base . 'files/' . $uri;
+		my (undef, undef, undef, undef, undef, undef, undef, $size, undef, $mtime) = stat($fname)
+			or error($r, "stat of $fname: $!");
+
+		my $res = Plack::Response->new(200);
+		$res->content_type(Sesse::pr0n::Common::get_mimetype_from_filename($uri));
+		$res->content_length($size);	
+		Sesse::pr0n::Common::set_last_modified($res, $mtime);
+
+		#if((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
+		#	return $rc;
+		#}
+
+		$res->content(IO::File::WithPath->new($Sesse::pr0n::Config::image_base . 'files/' . $uri));
+		return $res;
 	} elsif ($uri eq '/newevent.html') {
-		$r->content_type('text/html; charset=utf-8');
-		$r->sendfile(Sesse::pr0n::Common::get_base($r) . "newevent.html");
-		return Apache2::Const::OK;
+		my $res = Plack::Response->new(200);
+		$res->content_type('text/html; charset=utf-8');
+		$res->content(IO::File::WithPath->new($Sesse::pr0n::Config::image_base . 'files/newevent.html'));
+		return $res;
 	} 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;
+		my $res = Plack::Response->new(200);
+		$res->content(IO::File::WithPath->new($Sesse::pr0n::Config::image_base . "usage/$1"));
+		return $res;
 	} elsif ($uri =~ m#^/rotate$#) {
 		return Sesse::pr0n::Rotate::handler($r);
 	} elsif ($uri =~ m#^/select$#) {
 		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 =~ /^\/[a-zA-Z0-9-]+\/?$/ ||
+		 $uri =~ /^\/\+all\/?$/) {
 		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+ ( \@\d+(\.\d+)? )? / | original/ )?
+                           ((?:no)?box/)?
+                           [a-zA-Z0-9._()-]+$#x) {
 		return Sesse::pr0n::Image::handler($r);
 	}
 
-	$r->status(404);
-	Sesse::pr0n::Common::header($r, "404 File Not Found");
-	$r->print("     <p>The file you requested was not found.</p>");
-	Sesse::pr0n::Common::footer($r);
-	return Apache2::Const::OK;
+	my $res = Plack::Response->new(404);
+	my $io = IO::String->new;
+	Sesse::pr0n::Common::header($r, $io, "404 File Not Found");
+	$io->print("     <p>The file you requested was not found.</p>");
+	Sesse::pr0n::Common::footer($r, $io);
+	$io->setpos(0);
+	$res->body($io);
+	return $res;
 }
 
 1;