Changeset 12908 for trunk/include

Timestamp:

Jan 17, 2012, 7:09:32 AM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - ability to choose displayed size on index page
-added some logs on i.php (configurable) to measure the perf

Location:

trunk/include

Files:

• category_default.inc.php (modified) (4 diffs)
• config_default.inc.php (modified) (2 diffs)
• derivative.inc.php (modified) (4 diffs)
• derivative_params.inc.php (modified) (1 diff)
• template.class.php (modified) (2 diffs)

trunk/include/category_default.inc.php

@@ -3 +3 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
@@ -105 +105 @@
       );
 
-  if (isset($nb_comments_of) )
+  if (isset($nb_comments_of))
   {
-    $row['nb_comments'] = (int)@$nb_comments_of[$row['id']];
+    $row['NB_COMMENTS'] = $row['nb_comments'] = (int)@$nb_comments_of[$row['id']];
   }
 
   $name = get_picture_title($row);
 
-  $tpl_var = array(
-    'ID' => $row['id'],
+  $tpl_var = array_merge( $row, array(
     'TN_SRC' => DerivativeImage::thumb_url($row),
     'TN_ALT' => htmlspecialchars(strip_tags($name)),
     'TN_TITLE' => get_thumbnail_title($row),
     'URL' => $url,
+    'src_image' => new SrcImage($row),
+    ) );
 
-    // Extra fields for usage in extra themes
-    'FILE_PATH' => $row['path'],
-    'FILE_POSTED' => $row['date_available'],
-    'FILE_CREATED' => $row['date_creation'],
-    'FILE_DESC' => $row['comment'],
-    'FILE_AUTHOR' => $row['author'],
-    'FILE_HIT' => $row['hit'],
-    'FILE_SIZE' => $row['filesize'],
-    'FILE_WIDTH' => $row['width'],
-    'FILE_HEIGHT' => $row['height'],
-    'FILE_METADATE' => $row['date_metadata_update'],
-    'FILE_HAS_HD' => $row['has_high'],
-    'FILE_HD_WIDTH' => $row['high_width'],
-    'FILE_HD_HEIGHT' => $row['high_height'],
-    'FILE_HD_FILESIZE' => $row['high_filesize'],
-    'FILE_RATING_SCORE' => $row['rating_score'],
-    );
-  
   if ($conf['index_new_icon'])
   {
@@ -146 +129 @@
     $tpl_var['NB_HITS'] = $row['hit'];
   }
-  
+
   switch ($page['section'])
   {
@@ -163 +146 @@
     }
   }
-  
+
   $tpl_var['NAME'] = $name;
-
-  if (isset($row['nb_comments']))
-  {
-    $tpl_var['NB_COMMENTS'] = $row['nb_comments'];
-  }
-
   $tpl_thumbnails_var[] = $tpl_var;
 }
 
-$template->assign('SHOW_THUMBNAIL_CAPTION', $conf['show_thumbnail_caption']);
+$derivative_params = ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) );
+
+$template->assign( array(
+  'derivative_params' =>$derivative_params,
+  'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'],
+    ) );
 $tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures);
 $template->assign('thumbnails', $tpl_thumbnails_var);
 
 $template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');
-
+unset($pictures, $selection, $tpl_thumbnails_var);
+$template->clear_assign( array('thumbnails') );
 pwg_debug('end include/category_default.inc.php');
 ?>

trunk/include/config_default.inc.php

@@ -3 +3 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
@@ -467 +467 @@
 // gives an empty value '' to deactivate
 $conf['show_php_errors'] = E_ALL;
+
+// enable log for i derivative script
+$conf['enable_i_log'] = false;
 
 // +-----------------------------------------------------------------------+

trunk/include/derivative.inc.php

@@ -101 +101 @@
   public $src_image;
 
-  private $requested_type;
-
   private $flags = 0;
   private $params;
@@ -112 +110 @@
     if (is_string($type))
     {
-      $this->requested_type = $type;
       $this->params = ImageStdParams::get_by_type($type);
     }
     else
     {
-      $this->requested_type = IMG_CUSTOM;
       $this->params = $type;
     }
@@ -126 +122 @@
   static function thumb_url($infos)
   {
-    $src_image = new SrcImage($infos);
-    self::build($src_image, ImageStdParams::get_by_type(IMG_THUMB), $rel_path, $rel_url);
-    return get_root_url().$rel_url;
+    return self::url(IMG_THUMB, $infos);
   }
 
   static function url($type, $infos)
   {
-    $src_image = new SrcImage($infos);
+    $src_image = is_object($infos) ? $infos : new SrcImage($infos);
     $params = is_string($type) ? ImageStdParams::get_by_type($type) : $type;
     self::build($src_image, $params, $rel_path, $rel_url);
@@ -258 +252 @@
     if ($size)
     {
-      return 'width="'.$size[0].'" height="'.$size[1].'"';
+      return 'width='.$size[0].' height='.$size[1];
     }
   }

trunk/include/derivative_params.inc.php

@@ -316 +316 @@
   }
 
+  function max_width()
+  {
+    return $this->sizing->ideal_size[0];
+  }
+
+  function max_height()
+  {
+    return $this->sizing->ideal_size[1];
+  }
+  
   function is_identity($in_size)
   {

trunk/include/template.class.php

@@ -3 +3 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
@@ -843 +843 @@
     return call_user_func_array('sprintf',  $args );
   }
+  
+  function derivative_url($type, $img)
+  {
+    return DerivativeImage::url($type, $img);
+  }
 }