X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=da45cfbd098571baece177482b5f795549c2d04f;hp=23b7d1b60c93fc12d63afb6f120581f0f6f9c1bc;hb=a8507a180fdcb9e5e78dd689d1be1fa08401441e;hpb=7ed166d00c60530874566d5e67130464e6fc0415

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 23b7d1b..da45cfb 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -15,22 +15,26 @@ sub handler {
 
 	# Find the event and file name
 	my ($event,$filename,$xres,$yres);
-	my $infobox = 1;
-	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._()-]+)$#) {
+	my $infobox = 'both';
+	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._()-]+)$#) {
+		$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+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $5;
 		$xres = $2;
 		$yres = $3;
-		$infobox = 0 if (defined($4));
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._()-]+)$#) {
+		$infobox = 'nobox' if (defined($4) && $4 eq 'nobox/');
+		$infobox = 'box' if (defined($4) && $4 eq 'box/');
+	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/((?:no)?box/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
 		$filename = $3;
 		$xres = -1;
 		$yres = -1;
-		$infobox = 0 if (defined($2));
+		$infobox = 'nobox' if (defined($2) && $2 eq 'nobox/');
+		$infobox = 'box' if (defined($2) && $2 eq 'box/');
 	}
 
 	my ($id, $dbwidth, $dbheight);
@@ -47,19 +51,11 @@ sub handler {
 	$dbwidth = $ref->{'width'};
 	$dbheight = $ref->{'height'};
 
-	#}
-		
-	$dbwidth = -1 unless defined($dbwidth);
-	$dbheight = -1 unless defined($dbheight);
-
 	# Scale if we need to do so
-	my ($fname,$thumbnail) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres);
+	my ($fname, $mime_type) = Sesse::pr0n::Common::ensure_cached($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres);
 
 	# Output the image to the user
-	my $mime_type;
-	if ($thumbnail) {
-		$mime_type = "image/jpeg";
-	} else {
+	if (!defined($mime_type)) {
 		$mime_type = Sesse::pr0n::Common::get_mimetype_from_filename($filename);
 	}
 	$r->content_type($mime_type);