X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=23b7d1b60c93fc12d63afb6f120581f0f6f9c1bc;hp=30bf73647fc4cbaee00cd970ac3f6116aaedea45;hb=73fb28c105ea6fb43d0a22762b96baff11e00631;hpb=2d6536cab108c937e2af49f7dcf15f2230f44d1a

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 30bf736..23b7d1b 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -16,38 +16,38 @@ sub handler {
 	# Find the event and file name
 	my ($event,$filename,$xres,$yres);
 	my $infobox = 1;
-	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/([a-zA-Z0-9._-]+)$#) {
+	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._()-]+)$#) {
 		$event = $1;
-		$filename = $2;
-	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
+		$filename = $3;
+	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([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._()-]+)$#) {
+		$event = $1;
+		$filename = $3;
+		$xres = -1;
+		$yres = -1;
+		$infobox = 0 if (defined($2));
 	}
 
 	my ($id, $dbwidth, $dbheight);
-	if ($event eq 'single' && $filename =~ /^(\d+)\.jpeg$/) {
-		$id = $1;
-	} else {
-		# Alas, we obviously need to do this :-)
-		# my $evq = $dbh->prepare('SELECT count(*) AS numev FROM events WHERE id=? AND vhost=?')
-		# or die "prepare(): $!";
-		# my $ref = $dbh->selectrow_hashref($evq, undef, $event, $r->get_server_name)
-		# 	or dberror($r, "Could not look up $event");
-		# $ref->{'numev'} == 1
-		# 	or error($r, "Could not find $event", 404, "File not found");
+	#if ($event eq 'single' && $filename =~ /^(\d+)\.jpeg$/) {
+	#	$id = $1;
+	#} else {
 	
-		# Look it up in the database
-		my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND filename=?',
-			undef, $event, $filename);
-		error($r, "Could not find $event/$filename", 404, "File not found") unless (defined($ref));
+	# 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));
 
-		$id = $ref->{'id'};
-		$dbwidth = $ref->{'width'};
-		$dbheight = $ref->{'height'};
-	}
+	$id = $ref->{'id'};
+	$dbwidth = $ref->{'width'};
+	$dbheight = $ref->{'height'};
+
+	#}
 		
 	$dbwidth = -1 unless defined($dbwidth);
 	$dbheight = -1 unless defined($dbheight);