Changeset 12797 for trunk/include

Timestamp:

Dec 27, 2011, 9:26:49 PM (12 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• nicer presentation on picture.php
• added a maintenance purge derivatives action

Location:

trunk/include

Files:

• derivative.inc.php (modified) (6 diffs)
• derivative_params.inc.php (modified) (1 diff)
• picture_metadata.inc.php (modified) (2 diffs)

trunk/include/derivative.inc.php

@@ -22 +22 @@
 final class SrcImage
 {
+  const IS_ORIGINAL = 0x01;
+  const IS_MIMETYPE = 0x02;
+
   public $rel_path;
-  
+
   public $coi=null;
   private $size=null;
+  private $flags=0;
 
   function __construct($infos)
@@ -35 +39 @@
     {
       $this->rel_path = $infos['path'];
+      $this->flags |= self::IS_ORIGINAL;
     }
     elseif (!empty($infos['representative_ext']))
@@ -45 +50 @@
     else
     {
-      $this->rel_path = get_themeconf('mime_icon_dir').strtolower($ext).'.png';
+      $ext = strtolower($ext);
+      $this->rel_path = trigger_event('get_mimetype_location', get_themeconf('mime_icon_dir').$ext.'.png', $ext );
+      $this->flags |= self::IS_MIMETYPE;
+      $this->size = @getimagesize(PHPWG_ROOT_PATH.$this->rel_path);
     }
 
     $this->coi = @$infos['coi'];
-    if (isset($infos['width']) && isset($infos['height']))
+    if (!$this->size && isset($infos['width']) && isset($infos['height']))
     {
       $this->size = array($infos['width'], $infos['height']);
     }
+  }
+
+  function is_original()
+  {
+    return $this->flags & self::IS_ORIGINAL;
+  }
+
+  function is_mimetype()
+  {
+    return $this->flags & self::IS_MIMETYPE;
+  }
+
+  function get_path()
+  {
+    return PHPWG_ROOT_PATH.$this->rel_path;
+  }
+
+  function get_url()
+  {
+    return get_root_url().$this->rel_path;
   }
 
@@ -127 +155 @@
       $ret[$type] = $ret[$type2];
     }
-    
+
     return $ret;
   }
@@ -145 +173 @@
     $tokens[] = substr($params->type,0,2);
 
-    if (!empty($src->coi))
+    if ($params->sizing->max_crop != 0 and !empty($src->coi))
     {
       $tokens[] = 'ci'.$src->coi;
@@ -207 +235 @@
 
 
+  function get_type()
+  {
+    if ($this->flags & self::SAME_AS_SRC)
+      return 'original';
+    return $this->params->type;
+  }
+
   /* returns the size of the derivative image*/
   function get_size()

trunk/include/derivative_params.inc.php

@@ -20 +20 @@
 // +-----------------------------------------------------------------------+
 
+function derivative_to_url($t)
+{
+  return substr($t, 0, 2);
+}
+
 function size_to_url($s)
 {

trunk/include/picture_metadata.inc.php

@@ -37 +37 @@
   }
 
-  $exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
+  $exif = get_exif_data($picture['current']['src_image']->get_path(), $exif_mapping);
   
   if (count($exif) > 0)
@@ -80 +80 @@
 if ($conf['show_iptc'])
 {
-  $iptc = get_iptc_data($picture['current']['image_path'], $conf['show_iptc_mapping']);
+  $iptc = get_iptc_data($picture['current']['src_image']->get_path(), $conf['show_iptc_mapping']);
 
   if (count($iptc) > 0)