Changeset 12820 for trunk/i.php

Timestamp:

Jan 1, 2012, 10:10:43 PM (12 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• admin GUI for choosing derivative parameters + persistence

File:

• trunk/i.php (modified) (5 diffs)

trunk/i.php

@@ -168 +168 @@
     try
     {
-      $page['derivative_params'] = ImageParams::from_url_tokens($deriv);
+      $page['derivative_params'] = DerivativeParams::from_url_tokens($deriv);
     }
     catch (Exception $e)
@@ -184 +184 @@
 }
 
+
+function send_derivative($expires)
+{
+  global $page;
+  $fp = fopen($page['derivative_path'], 'rb');
+
+  $fstat = fstat($fp);
+  header('Last-Modified: '.gmdate('D, d M Y H:i:s', $fstat['mtime']).' GMT');
+  if ($expires!==false)
+  {
+    header('Expires: '.gmdate('D, d M Y H:i:s', $expires).' GMT');
+  }
+  header('Content-length: '.$fstat['size']);
+  header('Connection: close');
+
+  $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);
+  fclose($fp);
+}
 
 
@@ -220 +247 @@
 {
   $need_generate = true;
+}
+
+$expires=false;
+$now = time();
+if ( $now > (max($src_mtime, $params->last_mod_time) + 24*3600) )
+{// somehow arbitrary - if derivative params or src didn't change for the last 24 hours, we send an expire header for several days
+  $expires = $now + 10*24*3600;
 }
 
@@ -231 +265 @@
     exit;
   }
-  // todo send pass-through
+  send_derivative($expires);
 }
 
@@ -271 +305 @@
 $image->destroy();
 
-$fp = fopen($page['derivative_path'], 'rb');
-
-$fstat = fstat($fp);
-header('Last-Modified: '.gmdate('D, d M Y H:i:s', $fstat['mtime']).' GMT');
-header('Expires: '.gmdate('D, d M Y H:i:s', time()+10*24*3600).' GMT');
-header('Content-length: '.$fstat['size']);
-header('Connection: close');
-
-$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);
-fclose($fp);
+send_derivative($expires);
 ?>