X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=6a4f7a80e71a64f2653d1a2d5d596a04c065aa18;hp=372a9b19e5756a2ca85bd44949c5c2e2b623c7e0;hb=e6c0be9c884c678d048a9a9a569dc1a3f6f83f34;hpb=bf395f582ddf4acd911cdeecca86b24fbc0e833f

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 372a9b1..6a4f7a8 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -13,29 +13,26 @@ sub handler {
 #		die "Har du lest FAQen?";
 #	}
 
-	# Find the event and file name
+	# Find the event and file name (nobox/ is for compatibility with legacy URLs).
 	my ($event,$filename,$xres,$yres,$dpr);
-	my $infobox = 'both';
-	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+	my $infobox = 0;
+	if ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/original/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
-		$infobox = 'nobox' if (defined($2) && $2 eq 'nobox/');
-		$infobox = 'box' if (defined($2) && $2 eq 'box/');
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)(?:\@(\d+(?:\.\d+)?))?/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+		$infobox = 1 if (defined($2) && $2 eq 'box/');
+	} elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)(?:\@(\d+(?:\.\d+)?))?/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $6;
 		$xres = $2;
 		$yres = $3;
 		$dpr = $4;
-		$infobox = 'nobox' if (defined($5) && $5 eq 'nobox/');
-		$infobox = 'box' if (defined($5) && $5 eq 'box/');
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
+		$infobox = 1 if (defined($5) && $5 eq 'box/');
+	} elsif ($r->path_info =~ m#^/([a-zA-Z0-9-]+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
 		$xres = -1;
 		$yres = -1;
-		$infobox = 'nobox' if (defined($2) && $2 eq 'nobox/');
-		$infobox = 'box' if (defined($2) && $2 eq 'box/');
+		$infobox = 1 if (defined($2) && $2 eq 'box/');
 	}
 	$dpr //= 1;
 
@@ -46,8 +43,8 @@ sub handler {
 	
 	# Look it up in the database
 	my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND vhost=? AND filename=?',
-		undef, $event, $r->get_server_name, $filename);
-	error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref));
+		undef, $event, Sesse::pr0n::Common::get_server_name($r), $filename);
+	return error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref));
 
 	$id = $ref->{'id'};
 	$dbwidth = $ref->{'width'};
@@ -57,25 +54,26 @@ sub handler {
 	my ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres);
 
 	# Output the image to the user
+	my $res = Plack::Response->new(200);
+
 	if (!defined($mime_type)) {
 		$mime_type = Sesse::pr0n::Common::get_mimetype_from_filename($filename);
 	}
-	$r->content_type($mime_type);
+	$res->content_type($mime_type);
 	
 	my (undef, undef, undef, undef, undef, undef, undef, $size, undef, $mtime) = stat($fname)
-                or error($r, "stat of $fname: $!");
+                or return error($r, "stat of $fname: $!");
 		
-	$r->set_content_length($size);
-	$r->set_last_modified($mtime);
-
-	# If the client can use cache, by all means do so
-	if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
-		return $rc;
-	}
+	$res->content_length($size);
+	Sesse::pr0n::Common::set_last_modified($res, $mtime);
 
-	$r->sendfile($fname);
+	# # If the client can use cache, by all means do so
+	#if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
+	#	return $rc;
+	#}
 
-	return Apache2::Const::OK;
+	$res->content(IO::File::WithPath->new($fname));
+	return $res;
 }
 
 1;