Use anchors instead of start= on fullscreen link; fixes the close button.

[pr0n] / perl / Sesse / pr0n / Image.pm

diff --git a/perl/Sesse/pr0n/Image.pm b/perl/Sesse/pr0n/Image.pm
index 23b7d1b60c93fc12d63afb6f120581f0f6f9c1bc..6a4f7a80e71a64f2653d1a2d5d596a04c065aa18 100644 (file)
--- a/perl/Sesse/pr0n/Image.pm
+++ b/perl/Sesse/pr0n/Image.pm
@@ -13,25 +13,28 @@ sub handler {
 #              die "Har du lest FAQen?";
 #      }
 
-       # 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._()-]+)$#) {
+       # Find the event and file name (nobox/ is for compatibility with legacy URLs).
+       my ($event,$filename,$xres,$yres,$dpr);
+       my $infobox = 0;
+       if ($r->path_info =~ 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 = 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 = $5;
+               $filename = $6;
                $xres = $2;
                $yres = $3;
-               $infobox = 0 if (defined($4));
-       } elsif ($r->uri =~ m#^/([a-zA-Z0-9-]+)/(nobox/)?([a-zA-Z0-9._()-]+)$#) {
+               $dpr = $4;
+               $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 = 0 if (defined($2));
+               $infobox = 1 if (defined($2) && $2 eq 'box/');
        }
+       $dpr //= 1;
 
        my ($id, $dbwidth, $dbheight);
        #if ($event eq 'single' && $filename =~ /^(\d+)\.jpeg$/) {
@@ -40,44 +43,37 @@ 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'};
        $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, $dpr, $xres, $yres);
 
        # Output the image to the user
-       my $mime_type;
-       if ($thumbnail) {
-               $mime_type = "image/jpeg";
-       } else {
+       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);
+       $res->content_length($size);
+       Sesse::pr0n::Common::set_last_modified($res, $mtime);
 
-       # If the client can use cache, by all means do so
-       if ((my $rc = $r->meets_conditions) != Apache2::Const::OK) {
-               return $rc;
-       }
-
-       $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;