Changeset 12796 for trunk/include

Timestamp:

Dec 27, 2011, 6:26:44 AM (12 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• core implementation + usage on most public/admin pages
• still to do: sync process, upload, gui/persistence for size parameters, migration script, center of interest ...

Location:

trunk/include

Files:

• calendar_monthly.class.php (modified) (5 diffs)
• category_cats.inc.php (modified) (2 diffs)
• category_default.inc.php (modified) (1 diff)
• common.inc.php (modified) (2 diffs)
• config_default.inc.php (modified) (2 diffs)
• constants.php (modified) (1 diff)
• derivative.inc.php (added)
• derivative_params.inc.php (added)
• derivative_std_params.inc.php (added)
• functions.inc.php (modified) (3 diffs)
• functions_notification.inc.php (modified) (2 diffs)
• picture_metadata.inc.php (modified) (3 diffs)
• ws_functions.inc.php (modified) (19 diffs)

trunk/include/calendar_monthly.class.php

@@ -351 +351 @@
     $page['chronology_date'][CDAY]=$day;
     $query = '
-SELECT id, file,tn_ext,path, width, height, '.pwg_db_get_dayofweek($this->date_field).'-1 as dow';
+SELECT id, file,representative_ext,path,width, height, '.pwg_db_get_dayofweek($this->date_field).'-1 as dow';
     $query.= $this->inner_sql;
     $query.= $this->get_date_where();
@@ -360 +360 @@
 
     $row = pwg_db_fetch_assoc(pwg_query($query));
-    $items[$day]['tn_url'] = get_thumbnail_url($row);
+    $derivative = new DerivativeImage(IMG_SQUARE, new SrcImage($row));
+    $items[$day]['derivative'] = $derivative;
     $items[$day]['file'] = $row['file'];
-    $items[$day]['path'] = $row['path'];
-    $items[$day]['tn_ext'] = @$row['tn_ext'];
-    $items[$day]['width'] = $row['width'];
-    $items[$day]['height'] = $row['height'];
     $items[$day]['dow'] = $row['dow'];
   }
 
-  if ( !empty($items)
-      and $conf['calendar_month_cell_width']>0
-      and $conf['calendar_month_cell_height']>0)
+  if ( !empty($items) )
   {
     list($known_day) = array_keys($items);
@@ -397 +392 @@
     }
 
-    $cell_width = $conf['calendar_month_cell_width'];
-    $cell_height = $conf['calendar_month_cell_height'];
+    list($cell_width, $cell_height) = ImageStdParams::get_by_type(IMG_SQUARE)->sizing->ideal_size;
 
     $tpl_weeks    = array();
@@ -431 +425 @@
       else
       {
-        $thumb = get_thumbnail_path($items[$day]);
-        $tn_size = @getimagesize($thumb);
-
-        $tn_width = $tn_size[0];
-        $tn_height = $tn_size[1];
+        list($tn_width,$tn_height) = $items[$day]['derivative']->get_size();
 
         // now need to fit the thumbnail of size tn_size within
@@ -492 +482 @@
               'DOW'         => $dow,
               'NB_ELEMENTS' => $items[$day]['nb_images'],
-              'IMAGE'       => $items[$day]['tn_url'],
+              'IMAGE'       => $items[$day]['derivative']->get_url(),
               'U_IMG_LINK'  => $url,
               'IMAGE_STYLE' => $css_style,

trunk/include/category_cats.inc.php

@@ -190 +190 @@
     if ($row['level'] <= $user['level'])
     {
-      $row['tn_src'] = get_thumbnail_url($row);
+      $row['tn_src'] = DerivativeImage::thumb_url($row);
       $infos_of_image[$row['id']] = $row;
     }
@@ -237 +237 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      $row['tn_src'] = get_thumbnail_url($row);
+      $row['tn_src'] =  DerivativeImage::thumb_url($row);
       $infos_of_image[$row['id']] = $row;
     }

trunk/include/category_default.inc.php

@@ -114 +114 @@
   $tpl_var = array(
     'ID' => $row['id'],
-    'TN_SRC' => get_thumbnail_url($row),
+    'TN_SRC' => DerivativeImage::thumb_url($row),
     'TN_ALT' => htmlspecialchars(strip_tags($name)),
     'TN_TITLE' => get_thumbnail_title($row),

trunk/include/common.inc.php

@@ -108 +108 @@
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
-include( PHPWG_ROOT_PATH .'include/template.class.php');
+include(PHPWG_ROOT_PATH .'include/template.class.php');
 
 // Database connection
@@ -132 +132 @@
   }
 }
+
+ImageStdParams::load_from_db();
 
 load_plugins();

trunk/include/config_default.inc.php

@@ -89 +89 @@
 //no elements for these
 $conf['calendar_show_empty'] = true;
-
-// calendar_month_cell_width, calendar_month_cell_height : define the
-// width and the height of a cell in the monthly calendar when viewing a
-// given month. a value of 0 means that the pretty view is not shown.
-// a good suggestion would be to have the width and the height equal
-// and smaller than upload thumbnails configuration size.
-$conf['calendar_month_cell_width'] =80;
-$conf['calendar_month_cell_height']=80;
 
 // newcat_default_commentable : at creation, must a category be commentable
@@ -761 +753 @@
 // upload form or through pwg.images.addSimple web API method?
 $conf['upload_form_automatic_rotation'] = true;
+
+// 0-'auto', 1-'derivative' 2-'script'
+$conf['derivative_url_style']=0;
+
+$conf['chmod_value']=0777;
+
 ?>

trunk/include/constants.php

@@ -28 +28 @@
 
 define('PHPWG_THEMES_PATH', $conf['themes_dir'].'/');
-define('PWG_COMBINED_DIR', PWG_LOCAL_DIR.'combined/');
+defined('PWG_COMBINED_DIR') or define('PWG_COMBINED_DIR', PWG_LOCAL_DIR.'combined/');
+defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', PWG_LOCAL_DIR.'i/');
 
 // Required versions

trunk/include/functions.inc.php

@@ -31 +31 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
+include_once( PHPWG_ROOT_PATH .'/include/derivative_params.inc.php');
+include_once( PHPWG_ROOT_PATH .'/include/derivative_std_params.inc.php');
+include_once( PHPWG_ROOT_PATH .'/include/derivative.inc.php');
 
 //----------------------------------------------------------- generic functions
@@ -168 +171 @@
   if ( !is_dir($dir) )
   {
+    global $conf;
     if (substr(PHP_OS, 0, 3) == 'WIN')
     {
@@ -173 +177 @@
     }
     $umask = umask(0);
-    $mkd = @mkdir($dir, 0755, ($flags&MKGETDIR_RECURSIVE) ? true:false );
+    $mkd = @mkdir($dir, $conf['chmod_value'], ($flags&MKGETDIR_RECURSIVE) ? true:false );
     umask($umask);
     if ($mkd==false)

trunk/include/functions_notification.inc.php

@@ -459 +459 @@
     { // get some thumbnails ...
       $query = '
-SELECT DISTINCT id, path, name, tn_ext, file
+SELECT DISTINCT id, path, name, representative_ext, file
   FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id
   '.$where_sql.'
@@ -536 +536 @@
   foreach($date_detail['elements'] as $element)
   {
-    $tn_src = get_thumbnail_url($element);
+    $tn_src = DerivativeImage::thumb_url($element);
     $description .= '<a href="'.
                     make_picture_url(array(

trunk/include/picture_metadata.inc.php

@@ -27 +27 @@
  */
 
-// $picture['current']['high_url'] may not be set if the user has no access
-// to the high definition, but we may want to display metadata and read the
-// high definition is available
-$high_url = null;
-if (isset($picture['current']['high_url']))
-{
-  $high_url = $picture['current']['high_url'];
-}
-else
-{
-  $high_url = get_high_url($picture['current']);
-}
 
 include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
@@ -50 +38 @@
 
   $exif = get_exif_data($picture['current']['image_path'], $exif_mapping);
-  if (count($exif) == 0 and $picture['current']['has_high'])
-  {
-    $exif = get_exif_data($high_url, $exif_mapping);
-  }
   
   if (count($exif) > 0)
@@ -97 +81 @@
 {
   $iptc = get_iptc_data($picture['current']['image_path'], $conf['show_iptc_mapping']);
-  if (count($iptc) == 0 and $picture['current']['has_high'])
-  {
-    $iptc = get_iptc_data($high_url, $conf['show_iptc_mapping']);
-  }
 
   if (count($iptc) > 0)

trunk/include/ws_functions.inc.php

@@ -147 +147 @@
 function ws_std_get_urls($image_row)
 {
-  $ret = array(
-    'tn_url' => get_thumbnail_url($image_row),
-    'element_url' => get_element_url($image_row)
-  );
+  $ret = array();
   global $user;
-  if ($user['enabled_high'] and $image_row['has_high'] )
-  {
-    $ret['high_url'] = get_high_url($image_row);
-  }
+  if ($user['enabled_high'])
+  {
+    $ret['element_url'] = get_element_url($image_row);
+  }
+  
+  $derivatives = DerivativeImage::get_all($image_row);
+  $derivatives_arr = array();
+  foreach($derivatives as $type=>$derivative)
+  {
+    $size = $derivative->get_size();
+    $size != null or $size=array(null,null);
+    $derivatives_arr[$type] = array('url' => $derivative->get_url(), 'width'=>$size[0], 'height'=>$size[1] );
+  }
+  $ret['derivatives'] = $derivatives_arr;;
   return $ret;
 }
@@ -166 +173 @@
 {
   return array(
-    'id','tn_url','element_url','high_url', 'file','width','height','hit','date_available','date_creation'
+    'id','element_url', 'file','width','height','hit','date_available','date_creation'
     );
 }
@@ -621 +628 @@
 
     $query = '
-SELECT id, path, tn_ext, level
+SELECT id, path, representative_ext, level
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $image_ids).')
@@ -630 +637 @@
       if ($row['level'] <= $user['level'])
       {
-        $thumbnail_src_of[$row['id']] = get_thumbnail_url($row);
+        $thumbnail_src_of[$row['id']] = DerivativeImage::thumb_url($row);
       }
       else
@@ -669 +676 @@
     {
       $query = '
-SELECT id, path, tn_ext
+SELECT id, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $new_image_ids).')
@@ -676 +683 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        $thumbnail_src_of[$row['id']] = get_thumbnail_url($row);
+        $thumbnail_src_of[$row['id']] = DerivativeImage::thumb_url($row);
       }
     }
@@ -1371 +1378 @@
   if (!is_dir($upload_dir)) {
     umask(0000);
-    $recursive = true;
-    if (!@mkdir($upload_dir, 0777, $recursive))
+    if (!@mkdir($upload_dir, 0777, true))
     {
       return new PwgError(500, 'error during buffer directory creation');
@@ -1425 +1431 @@
     if (is_file($output_filepath))
     {
-      new PwgError(500, '[merge_chunks] error while trying to remove existing '.$output_filepath);
-      exit();
+      return new PwgError(500, '[merge_chunks] error while trying to remove existing '.$output_filepath);
     }
   }
@@ -1465 +1470 @@
     if (!file_put_contents($output_filepath, $string, FILE_APPEND))
     {
-      new PwgError(500, '[merge_chunks] error while writting chunks for '.$output_filepath);
-      exit();
+      return new PwgError(500, '[merge_chunks] error while writting chunks for '.$output_filepath);
     }
 
@@ -1501 +1505 @@
     if (!@mkdir($upload_dir, 0777, $recursive))
     {
-      new PwgError(500, '[add_file] error during '.$type.' directory creation');
-      exit();
+      return new PwgError(500, '[add_file] error during '.$type.' directory creation');
     }
   }
@@ -1513 +1516 @@
     if (!is_writable($upload_dir))
     {
-      new PwgError(500, '[add_file] '.$type.' directory has no write access');
-      exit();
+      return new PwgError(500, '[add_file] '.$type.' directory has no write access');
     }
   }
@@ -1526 +1528 @@
   // check dumped thumbnail md5
   $dumped_md5 = md5_file($file_path);
-  if ($dumped_md5 != $file_sum) {
-    new PwgError(500, '[add_file] '.$type.' transfer failed');
-    exit();
+  if ($dumped_md5 != $file_sum) 
+  {
+    return new PwgError(500, '[add_file] '.$type.' transfer failed');
   }
 
@@ -2452 +2454 @@
       else
       {
-        new PwgError(
+        return new PwgError(
           500,
           '[ws_images_setInfo]'
@@ -2458 +2460 @@
           .', possible values are {fill_if_empty, replace}.'
           );
-        exit();
       }
     }
@@ -2467 +2468 @@
     if (!empty($image_row['storage_category_id']))
     {
-      new PwgError(500, '[ws_images_setInfo] updating "file" is forbidden on photos added by synchronization');
-      exit();
+      return new PwgError(500, '[ws_images_setInfo] updating "file" is forbidden on photos added by synchronization');
     }
 
@@ -2518 +2518 @@
     else
     {
-      new PwgError(
+      return new PwgError(
         500,
         '[ws_images_setInfo]'
@@ -2524 +2524 @@
         .', possible values are {replace, append}.'
         );
-      exit();
     }
   }
@@ -2611 +2610 @@
   if (count($cat_ids) == 0)
   {
-    new PwgError(
+    return new PwgError(
       500,
       '[ws_add_image_category_relations] there is no category defined in "'.$categories_string.'"'
       );
-    exit();
   }
 
@@ -2629 +2627 @@
   if (count($unknown_cat_ids) != 0)
   {
-    new PwgError(
+    return new PwgError(
       500,
       '[ws_add_image_category_relations] the following categories are unknown: '.implode(', ', $unknown_cat_ids)
       );
-    exit();
   }