X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FImage.pm;h=d1743b41d5c456428e4ce78cf0a19e803f0ff065;hp=6df8ea25e29509a643ef829120f110c59dffea32;hb=fa10473159be03eb924e50cdb4688540c78f89b1;hpb=576c411da9608bb7155e89811694f9f19e542773

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 6df8ea2..d1743b4 100644
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -16,9 +16,9 @@ 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/([a-zA-Z0-9._-]+)$#) {
+	if ($r->uri =~ m#^/([a-zA-Z0-9-]+)/original/(nobox/)?([a-zA-Z0-9._-]+)$#) {
 		$event = $1;
-		$filename = $2;
+		$filename = $3;
 	} elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(\d+)x(\d+)/(nobox/)?([a-zA-Z0-9._-]+)$#) {
 		$event = $1;
 		$filename = $5;
@@ -46,8 +46,8 @@ sub handler {
 		# 	or error($r, "Could not find $event", 404, "File not found");
 	
 		# Look it up in the database
-		my $ref = $dbh->selectrow_hashref('SELECT id,width,height FROM images WHERE event=? AND filename=?',
-			undef, $event, $filename);
+		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'};