Changeset 12796

Timestamp:

12/27/11 06:26:44 (17 months 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

Files:

• admin/batch_manager_global.php (modified) (2 diffs)
• admin/batch_manager_unit.php (modified) (2 diffs)
• admin/cat_modify.php (modified) (3 diffs)
• admin/comments.php (modified) (2 diffs)
• admin/element_set_ranks.php (modified) (3 diffs)
• admin/history.php (modified) (6 diffs)
• admin/picture_modify.php (modified) (1 diff)
• admin/rating.php (modified) (2 diffs)
• admin/rating_user.php (modified) (3 diffs)
• admin/themes/default/template/rating_user.tpl (modified) (2 diffs)
• comments.php (modified) (2 diffs)
• i.php (added)
• include/calendar_monthly.class.php (modified) (5 diffs)
• include/category_cats.inc.php (modified) (2 diffs)
• include/category_default.inc.php (modified) (1 diff)
• include/common.inc.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (2 diffs)
• include/constants.php (modified) (1 diff)
• include/derivative.inc.php (added)
• include/derivative_params.inc.php (added)
• include/derivative_std_params.inc.php (added)
• include/functions.inc.php (modified) (3 diffs)
• include/functions_notification.inc.php (modified) (2 diffs)
• include/picture_metadata.inc.php (modified) (3 diffs)
• include/ws_functions.inc.php (modified) (19 diffs)
• picture.php (modified) (9 diffs)
• themes/default/template/picture_content.tpl (modified) (1 diff)

trunk/admin/batch_manager_global.php

@@ -712 +712 @@
 
   $query = '
-SELECT id,path,tn_ext,file,filesize,level,name
+SELECT id,path,representative_ext,file,filesize,level,name
   FROM '.IMAGES_TABLE;
   
@@ -748 +748 @@
   {
     $nb_thumbs_page++;
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
 
     $title = $row['name'];

trunk/admin/batch_manager_unit.php

@@ -202 +202 @@
 
   $query = '
-SELECT id,path,tn_ext,name,date_creation,comment,author,level,file
+SELECT id,path,representative_ext,name,date_creation,comment,author,level,file
   FROM '.IMAGES_TABLE;
   
@@ -238 +238 @@
     array_push($element_ids, $row['id']);
 
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
 
     // creation date

trunk/admin/cat_modify.php

@@ -302 +302 @@
   {
     $query = '
-SELECT id,tn_ext,path
+SELECT id,representative_ext,path
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$category['representative_picture_id'].'
 ;';
     $row = pwg_db_fetch_assoc(pwg_query($query));
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
     $url = get_root_url().'admin.php?page=picture_modify';
     $url.= '&image_id='.$category['representative_picture_id'];
@@ -388 +388 @@
   {
     $query = '
-SELECT id, file, path, tn_ext
+SELECT id, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$category['representative_picture_id'].'
@@ -404 +404 @@
                           'category' => $category
                         ))
-                      .'" class="thumblnk"><img src="'.get_thumbnail_url($element).'"></a>';
+                      .'" class="thumblnk"><img src="'.DerivativeImage::thumb_url($element).'"></a>';
     }
   }

trunk/admin/comments.php

@@ -100 +100 @@
 $query = '
 SELECT c.id, c.image_id, c.date, c.author, '.
-$conf['user_fields']['username'].' AS username, c.content, i.path, i.tn_ext
+$conf['user_fields']['username'].' AS username, c.content, i.path, i.representative_ext
   FROM '.COMMENTS_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i
@@ -112 +112 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  $thumb = get_thumbnail_url(
+  $thumb = DerivativeImage::thumb_url(
       array(
         'id'=>$row['image_id'],

trunk/admin/element_set_ranks.php

@@ -200 +200 @@
     file,
     path,
-    tn_ext,
+    representative_ext,
+    width, height,
     name,
     rank
@@ -215 +216 @@
         $thumbnail_info=array();
         $clipping=array();
+  $derivativeParams = ImageStdParams::get_by_type(IMG_SQUARE);
         while ($row = pwg_db_fetch_assoc($result))
         {
-                $src = get_thumbnail_url($row);
-
-                $thumbnail_size = getimagesize($src);
+    $derivative = new DerivativeImage($derivativeParams, new SrcImage($row));
+
+                $thumbnail_size = $derivative->get_size();
                 if ( !empty( $row['name'] ) )
                 {
@@ -234 +236 @@
                         'height'        => $thumbnail_size[1],
                         'id'    => $row['id'],
-                        'tn_src'        => $src,
+                        'tn_src'        => $derivative->get_url(),
                         'rank'  => $current_rank * 10,
                         );

trunk/admin/history.php

@@ -304 +304 @@
     file,
     path,
-    tn_ext
+    representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', array_keys($image_ids)).')
@@ -314 +314 @@
     $file_of_image = array();
     $path_of_image = array();
-    $tn_ext_of_image = array();
+    $representative_ext_of_image = array();
 
     $result = pwg_query($query);
@@ -333 +333 @@
       $file_of_image[ $row['id'] ] = $row['file'];
       $path_of_image[ $row['id'] ] = $row['path'];
-      $tn_ext_of_image[ $row['id'] ] = $row['tn_ext'];
+      $representative_ext_of_image[ $row['id'] ] = $row['representative_ext'];
     }
 
@@ -455 +455 @@
           'file' => $file_of_image[$line['image_id']],
           'path' => $path_of_image[$line['image_id']],
-          'tn_ext' => $tn_ext_of_image[$line['image_id']],
+          'representative_ext' => $representative_ext_of_image[$line['image_id']],
           );
         $thumbnail_display = $page['search']['fields']['display_thumbnail'];
@@ -488 +488 @@
           $image_string =
             '<a class="thumbnail" href="'.$picture_url.'">'
-            .'<span><img src="'.get_thumbnail_url($element)
+            .'<span><img src="'.DerivativeImage::thumb_url($element)
             .'" alt="'.$image_title.'" title="'.$image_title.'">'
             .'</span></a>';
@@ -497 +497 @@
           $image_string =
             '<a class="over" href="'.$picture_url.'">'
-            .'<span><img src="'.get_thumbnail_url($element)
+            .'<span><img src="'.DerivativeImage::thumb_url($element)
             .'" alt="'.$image_title.'" title="'.$image_title.'">'
             .'</span>'.$image_title.'</a>';

trunk/admin/picture_modify.php

@@ -283 +283 @@
     'PATH'=>$row['path'],
 
-    'TN_SRC' => get_thumbnail_url($row),
+    'TN_SRC' => DerivativeImage::thumb_url($row),
 
     'NAME' =>

trunk/admin/rating.php

@@ -185 +185 @@
         i.path,
         i.file,
-        i.tn_ext,
+        i.representative_ext,
         i.rating_score,
         r.element_id
@@ -202 +202 @@
 foreach ($images as $image)
 {
-  $thumbnail_src = get_thumbnail_url($image);
+  $thumbnail_src = DerivativeImage::thumb_url($image);
 
   $image_url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.

trunk/admin/rating_user.php

@@ -102 +102 @@
 if (count($image_ids) > 0 )
 {
-  $query = 'SELECT id, name, file, path, tn_ext
+  $query = 'SELECT id, name, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', array_keys($image_ids)).')';
@@ -109 +109 @@
   {
     $image_urls[ $row['id'] ] = array(
-      'tn' => get_thumbnail_url($row),
+      'tn' => DerivativeImage::thumb_url($row),
       'page' => make_picture_url( array('image_id'=>$row['id'], 'image_file'=>$row['file']) ),
     );
@@ -218 +218 @@
   'ratings' => $by_user_ratings,
   'image_urls' => $image_urls,
-  'TN_WIDTH' => 20+2*$conf['upload_form_thumb_maxwidth'],
+  'TN_WIDTH' => 28+2*ImageStdParams::get_by_type(IMG_THUMB)->sizing->ideal_size[0],
   ) );
 $template->set_filename('rating', 'rating_user.tpl');

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

@@ -60 +60 @@
                 {capture assign=rate_over}{foreach from=$rates item=rate_arr}<img src="{$image_urls[$rate_arr.id].tn}" alt="thumb-{$rate_arr.id}" title="{$rate_arr.date}"></img>
                 {/foreach}{/capture}
-                <a class="cluetip" title="{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
+                <a class="cluetip" title="|{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
                 {/if}</td>
         {/foreach}
@@ -72 +72 @@
 jQuery(document).ready(function(){ldelim}
         jQuery('.cluetip').cluetip({ldelim}
-                width: {$TN_WIDTH}, splitTitle: '|'
+                width: {$TN_WIDTH}, showTitle:false, splitTitle: '|'
         });
 })

trunk/comments.php

@@ -409 +409 @@
   $elements = array();
   $query = '
-SELECT id, name, file, path, tn_ext
+SELECT id, name, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $element_ids).')
@@ -451 +451 @@
 
     // source of the thumbnail picture
-    $thumbnail_src = get_thumbnail_url( $elements[$comment['image_id']] );
+    $thumbnail_src = DerivativeImage::thumb_url( $elements[$comment['image_id']] );
 
     // link to the full size picture

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();
   }
 

trunk/picture.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
-define('PHPWG_ROOT_PATH','./');
+define('PHPWG_ROOT_PATH','');
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
@@ -154 +154 @@
     return $content;
   }
-  if (!isset($element_info['image_url']))
-  { // nothing to do
-    return $content;
+
+  if (isset($_COOKIE['picture_deriv']))
+  {
+    pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
+    setcookie('picture_deriv', false, 0);
+  }
+  $deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
+  $selected_derivative = $element_info['derivatives'][$deriv_type];
+
+  $available_derivatives = array();
+  $added = array();
+  foreach($element_info['derivatives'] as $type => $derivative)
+  {
+    $url = $derivative->get_url();
+    if (isset($added[$url]))
+      continue;
+    $added[$url] = 1;
+    $available_derivatives[] = $type;
   }
 
   global $user, $page, $template;
+  
+  $template->append('current', array(
+      'selected_derivative' => $selected_derivative,
+      'available_derivative_types' => $available_derivatives,
+    ), true);
+
 
   $template->set_filenames(
@@ -165 +186 @@
     );
 
-  if ( !$page['slideshow'] and isset($element_info['high_url']) )
-  {
-    $uuid = uniqid(rand());
-    $template->assign(
-      'high',
-      array(
-        'U_HIGH' => $element_info['high_url'],
-        'UUID'   => $uuid,
-        )
-      );
-  }
   $template->assign( array(
-      'SRC_IMG' => $element_info['image_url'],
       'ALT_IMG' => $element_info['file'],
-      'WIDTH_IMG' => @$element_info['scaled_width'],
-      'HEIGHT_IMG' => @$element_info['scaled_height'],
       )
     );
@@ -404 +411 @@
 }
 
-// incrementation of the number of hits, we do this only if no action
+//---------- incrementation of the number of hits, we do this only if no action
 if (trigger_event('allow_increment_element_hit_count', !isset($_POST['content']) ) )
 {
@@ -493 +500 @@
   }
 
+  $picture[$i]['derivatives'] = DerivativeImage::get_all($row);
+  $picture[$i]['src_image'] = $picture[$i]['derivatives'][IMG_THUMB]->src_image;
+  $picture[$i]['thumbnail'] = $picture[$i]['derivatives'][IMG_THUMB]->get_url();
+  
   // ------ build element_path and element_url
   $picture[$i]['element_path'] = get_element_path($picture[$i]);
@@ -510 +521 @@
       if ( $user['enabled_high']=='true' )
       {
-        $hi_url=get_high_url($picture[$i]);
-        if ( !empty($hi_url) )
-        {
-          $picture[$i]['high_url'] = $hi_url;
-          $picture[$i]['download_url'] = get_download_url('h',$picture[$i]);
-        }
+        $picture[$i]['download_url'] = get_download_url('e',$picture[$i]);
       }
     }
@@ -524 +530 @@
   }
 
-  $picture[$i]['thumbnail'] = get_thumbnail_url($row);
 
   if ( !empty( $row['name'] ) )
@@ -567 +572 @@
     $picture['current']['height']= $taille_image[1];
   }
-}
-
-if (!empty($picture['current']['width']))
-{
-  list(
-    $picture['current']['scaled_width'],
-    $picture['current']['scaled_height']
-    ) = get_picture_size(
-      $picture['current']['width'],
-      $picture['current']['height'],
-      @$user['maxwidth'],
-      @$user['maxheight']
-    );
 }
 
@@ -897 +889 @@
 
 // size in pixels
-if ($picture['current']['is_picture'] AND $picture['current']['has_high'])
-{
-  if (!empty($picture['current']['high_width']))
-  {
-    $infos['INFO_DIMENSIONS'] = $picture['current']['high_width'].'*'.$picture['current']['high_height'];
-  }
-  else if ($hi_size = @getimagesize($hi_url))
-  {
-    pwg_query('
-      UPDATE ' . IMAGES_TABLE . '
-      SET 
-        high_width = \'' . $hi_size[0].'\',
-        high_height = \''.$hi_size[1] .'\'
-      WHERE id = ' . $picture['current']['id'] . ';
-    ');
-    
-    $infos['INFO_DIMENSIONS'] = $hi_size[0].'*'.$hi_size[1];
-  }
-}
-else if ($picture['current']['is_picture'] and isset($picture['current']['width']) )
-{
-  if ($picture['current']['scaled_width'] !== $picture['current']['width'] )
-  {
-    $infos['INFO_DIMENSIONS'] =
-      '<a href="'.$picture['current']['image_url'].'" title="'.
-      l10n('Original dimensions').'">'.
-      $picture['current']['width'].'*'.$picture['current']['height'].'</a>';
-  }
-  else
-  {
-    $infos['INFO_DIMENSIONS'] =
-      $picture['current']['width'].'*'.$picture['current']['height'];
-  }
+if ($picture['current']['is_picture'] and isset($picture['current']['width']) )
+{
+  $infos['INFO_DIMENSIONS'] =
+    $picture['current']['width'].'*'.$picture['current']['height'];
 }
 
 // filesize
-if ($picture['current']['has_high'] and !empty($picture['current']['high_filesize']))
-{
-  $infos['INFO_FILESIZE'] =
-    sprintf(l10n('%d Kb'), $picture['current']['high_filesize']);
-}
-else if (!empty($picture['current']['filesize']))
+if (!empty($picture['current']['filesize']))
 {
   $infos['INFO_FILESIZE'] =

trunk/themes/default/template/picture_content.tpl

@@ -1 @@
-{if isset($high)}
-{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-<a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
+<img src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} alt="{$ALT_IMG}" id="theMainImage"
+{if isset($COMMENT_IMG)}
+        title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
+{/if}>
+{if count($current.available_derivative_types)>1}
+{footer_script}{literal}
+function changeImgSrc(url,type)
+{
+        var theImg = document.getElementById("theMainImage");
+        if (theImg)
+        {
+                theImg.removeAttribute("width");theImg.removeAttribute("height");
+                theImg.src = url;
+        }
+        document.cookie = 'picture_deriv=' + type;
+}
+{/literal}{/footer_script}
+<p>
+{foreach from=$current.available_derivative_types item=derivative_type}
+<a onclick="changeImgSrc('{$current.derivatives[$derivative_type]->get_url()|@escape:javascript}', '{$derivative_type}')" title="{$current.derivatives[$derivative_type]->get_size_hr()}">{$derivative_type}</a>
+{/foreach}
+</p>
 {/if}
-        <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" id="theMainImage"
-        {if isset($COMMENT_IMG)}
-                title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
-        {/if}>
-{if isset($high) }
-</a>
-        <p>{'Click on the photo to see it in high definition'|@translate}</p>
-{/if}