Changeset 12779

Timestamp:

12/22/11 06:25:44 (18 months ago)

Author:

rvelices

Message:

derivatives
- fix url generation

Location:

extensions/derivatives

Files:

• i.php (modified) (2 diffs)
• include/derivative.inc.php (modified) (1 diff)

extensions/derivatives/i.php

@@ -125 +125 @@
   $pos!== false || ierror('Missing .', 400);
   $ext = substr($req, $pos);
+  $page['derivative_ext'] = $ext;
   $req = substr($req, 0, $pos);
 
@@ -278 +279 @@
 header('Connection: close');
 
-// todo send the right headers
-header("Content-Type: image/jpeg");
+$ctype="application/octet-stream";
+switch (strtolower($page['derivative_ext']))
+{
+    case "jpe": case "jpeg":
+    case "jpg": $ctype="image/jpeg"; break;
+    case "png": $ctype="image/png"; break;
+    case "gif": $ctype="image/gif"; break;
+}
+header("Content-Type: $ctype");
 
 fpassthru($fp);

extensions/derivatives/include/derivative.inc.php

@@ -183 +183 @@
       $rel_url = 'i';
       if ($conf['php_extension_in_urls']) $rel_url .= '.php';
-      if (!$conf['question_mark_in_urls']) $rel_url.= '?';
-      $rel_url .= $loc;
+      if ($conf['question_mark_in_urls']) $rel_url .= '?';
+      $rel_url .= '/'.$loc;
     }
     else