Changeset 12820

Timestamp:

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

Author:

rvelices

Message:

feature 2541 multisize

• admin GUI for choosing derivative parameters + persistence

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/derivatives.php (added)
• admin/include/functions.php (modified) (3 diffs)
• admin/themes/default/template/admin.tpl (modified) (1 diff)
• admin/themes/default/template/derivatives.tpl (added)
• i.php (modified) (5 diffs)
• include/derivative_params.inc.php (modified) (3 diffs)
• include/derivative_std_params.inc.php (modified) (5 diffs)
• language/en_UK/common.lang.php (modified) (1 diff)

trunk/admin.php

@@ -166 +166 @@
     'U_NOTIFICATION_BY_MAIL'=> $link_start.'notification_by_mail',
     'U_CONFIG_GENERAL'=> $link_start.'configuration',
+    'U_CONFIG_DERIVATIVES'=> $link_start.'derivatives',
     'U_CONFIG_DISPLAY'=> $conf_link.'default',
     'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates',

trunk/admin/include/functions.php

@@ -2055 +2055 @@
 
     case 'configuration':
+    case 'derivatives':
     case 'extend_for_templates':
     case 'menubar':
@@ -2248 +2249 @@
 }
 
-function clear_derivative_cache($type='all')
+/** delete all derivative files for one or several types */
+function clear_derivative_cache($types='all')
 {
   $pattern='#.*-';
-  if ($type == 'all')
+  if ($types == 'all')
+  {
+    $types = ImageStdParams::get_all_types();
+    $types[] = IMG_CUSTOM;
+  }
+  elseif (!is_array($types))
+  {
+    $types = array($types);
+  }
+
+  if (count($types)>1)
   {
     $type_urls = array();
-    foreach(ImageStdParams::get_all_types() as $dtype)
+    foreach($types as $dtype)
     {
       $type_urls[] = derivative_to_url($dtype);
     }
-    $type_urls[] = derivative_to_url(IMG_CUSTOM);
     $pattern .= '(' . implode('|',$type_urls) . ')';
   }
   else
   {
-    $pattern .= derivative_to_url($type);
-  }
+    $pattern .= derivative_to_url($types[0]);
+  }
+  
   $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#';
   if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
@@ -2321 +2333 @@
       }
       clearstatcache();
-      rmdir($path);
+      @rmdir($path);
     }
     return $rmdir;

trunk/admin/themes/default/template/admin.tpl

@@ -85 +85 @@
       <ul>
         <li><a href="{$U_CONFIG_GENERAL}">{'Options'|@translate}</a></li>
+                                <li><a href="{$U_CONFIG_DERIVATIVES}">{'Derivatives'|@translate}</a></li>
         <li><a href="{$U_CONFIG_MENUBAR}">{'Menu Management'|@translate}</a></li>
         <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>

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);
 ?>

trunk/include/derivative_params.inc.php

@@ -279 +279 @@
 
 /*how we generate a derivative image*/
-final class ImageParams
+final class DerivativeParams
 {
   public $type = IMG_CUSTOM;
@@ -290 +290 @@
   }
 
+  public function __sleep()
+  {
+      return array('last_mod_time', 'sizing');
+  }
+    
   function add_url_tokens(&$tokens)
   {
@@ -298 +303 @@
   {
     $sizing = SizingParams::from_url_tokens($tokens);
-    $ret = new ImageParams($sizing);
+    $ret = new DerivativeParams($sizing);
     return $ret;
   }

trunk/include/derivative_std_params.inc.php

@@ -35 +35 @@
   private static $type_map = array();
   private static $undefined_type_map = array();
-  
+
   static function get_all_types()
   {
     return self::$all_types;
   }
-  
+
   static function get_all_type_map()
   {
@@ -55 +55 @@
     return self::$undefined_type_map;
   }
-  
+
   static function get_by_type($type)
   {
     return self::$all_type_map[$type];
   }
-  
+
   static function load_from_db()
   {
-    self::make_default();
+    global $conf;
+    $arr = @unserialize($conf['derivatives']);
+    if (false!==$arr)
+    {
+      self::$type_map = $arr['d'];
+    }
+    else
+    {
+      self::make_default();
+    }
     self::build_maps();
   }
@@ -69 +78 @@
   static function load_from_file()
   {
-    self::make_default();
+    global $conf;
+    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
+    if (false!==$arr)
+    {
+      self::$type_map = $arr['d'];
+    }
+    else
+    {
+      self::make_default();
+    }
+    self::build_maps();
+  }
+
+  static function set_and_save($map)
+  {
+    global $conf;
+    self::$type_map = $map;
+
+    $ser = serialize( array(
+      'd' => self::$type_map
+      ) );
+    conf_update_param('derivatives', addslashes($ser) );
+    file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat', $ser);
     self::build_maps();
   }
@@ -75 +106 @@
   static function make_default()
   {
-    //todo
-    self::$type_map[IMG_SQUARE] = new ImageParams( SizingParams::square(100,100) );
-    self::$type_map[IMG_THUMB] = new ImageParams( SizingParams::classic(144,144) );
-    self::$type_map[IMG_SMALL] = new ImageParams( SizingParams::classic(240,240) );
-    self::$type_map[IMG_MEDIUM] = new ImageParams( SizingParams::classic(432,432) );
-    self::$type_map[IMG_LARGE] = new ImageParams( SizingParams::classic(648,576) );
-    self::$type_map[IMG_XLARGE] = new ImageParams( SizingParams::classic(864,648) );
-    self::$type_map[IMG_XXLARGE] = new ImageParams( SizingParams::classic(1200,900) );
+    self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(100,100) );
+    self::$type_map[IMG_THUMB] = new DerivativeParams( SizingParams::classic(144,144) );
+    self::$type_map[IMG_SMALL] = new DerivativeParams( SizingParams::classic(240,240) );
+    self::$type_map[IMG_MEDIUM] = new DerivativeParams( SizingParams::classic(432,432) );
+    self::$type_map[IMG_LARGE] = new DerivativeParams( SizingParams::classic(648,576) );
+    self::$type_map[IMG_XLARGE] = new DerivativeParams( SizingParams::classic(864,648) );
+    self::$type_map[IMG_XXLARGE] = new DerivativeParams( SizingParams::classic(1200,900) );
   }
-  
+
   private static function build_maps()
   {
@@ -111 +141 @@
     }
   }
-  
+
 }
 

trunk/language/en_UK/common.lang.php

@@ -363 +363 @@
 $lang['Your Gallery Customization'] = "Your gallery customization";
 $lang['Your password has been reset'] = 'Your password has been reset';
-
+$lang['square'] = "Square";
+$lang['thumb'] = "Thumb";
+$lang['small'] = "Small";
+$lang['medium'] = "Medium";
+$lang['large'] = "Large";
+$lang['xlarge'] = "XLarge";
+$lang['xxlarge'] = "XXLarge";
+$lang['original'] = "Original";
 ?>