Changeset 16931 for extensions/Autosize/include

Timestamp:

Jul 23, 2012, 3:01:09 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, new options

File:

• extensions/Autosize/include/affiche.php (modified) (4 diffs)

extensions/Autosize/include/affiche.php

@@ -12 +12 @@
 $DEBUG_autosize = isset($_GET['cl_debug_conflit']) ? $_GET['cl_debug_conflit'] : $DEBUG_autosize ;
 $DEBUG_autosize = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : $DEBUG_autosize ; 
-//=================================================================================================
+//===========================================================================
+$cookies="' x '";
 
-$img_width=isset($picture['current']['width'])?$picture['current']['width']:"480";
-$img_height=isset($picture['current']['height'])?$picture['current']['height']:"320";
-$img_scaled_width=isset($picture['current']['scaled_width'])?$picture['current']['scaled_width']:"480";
-$img_scaled_height=isset($picture['current']['scaled_height'])?$picture['current']['scaled_height']:"320";
+$current = $template->get_template_vars('current');
+if (isset($_COOKIE['picture_deriv']))
+  {
+  if (isset($_COOKIE['img_w']))
+  $cookies =  '"'.$_COOKIE['img_w']." x ".  $_COOKIE['img_h'] .'"';
 
-$src_img_h=isset($_POST['src_img_h'])?$_POST['src_img_h']: $img_height            ;
-$src_img_w= isset($_POST['src_img_w'])?$_POST['src_img_w']:  $img_width               ;
+    if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) )
+    {
+      pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
+    }
+    setcookie('picture_deriv', false, 0, cookie_path() );
+  }
+  $deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
+
+if (isset($current)){
+ $derivative=$current['selected_derivative'] ;
+  $imgScaledWH=$derivative->src_image->get_size();
+        $imgSizeWH  =  $derivative->get_size(); 
+  $img_type  =  $derivative->get_type();        
+  $img_url  = $derivative->get_url();
+  $img_all= $derivative->get_all($derivative->src_image);
+  $scaled_size=$derivative->get_size_hr(); //792 x 441
+   $scaled_size=$derivative->get_scaled_size_htm(); // width="792" height="441"
+   //================= taille mis a l'échelle 
+   $scaled_size=$derivative->get_scaled_size(100,100); // array([0]=>100,[1]=>55)
+  $src= $derivative->src_image ;
+     
+    }
+
+          $defined_types = array_keys(ImageStdParams::get_defined_type_map());      
+
+
+
+$img_width=isset($imgScaledWH)?$imgSizeWH[0]:"480";
+$img_height=isset($imgScaledWH)?$imgSizeWH[1]:"320";
+
+$img_scaled_width=isset($imgScaledWH)?$imgScaledWH[0]:"480";
+$img_scaled_height=isset($imgScaledWH)?$imgScaledWH[1]:"320";
+
+
+ 
+$src_img_h=isset($_POST['src_img_h'])?$_POST['src_img_h']: $img_height  ;
+$src_img_w= isset($_POST['src_img_w'])?$_POST['src_img_w']:  $img_width ;
+
 $window_height= isset($_POST['window_height'])?$_POST['window_height']: $img_scaled_height ;
 $window_width= isset($_POST['window_width'])?$_POST['window_width']: $img_scaled_width    ;
@@ -41 +79 @@
                                                                                         )
                                                                         );      
-                 
-if (!isset($conf['prefix_thumbnail'])) $conf['prefix_thumbnail']="TN_";                         
+if (!isset($conf['prefix_thumbnail'])) $conf['prefix_thumbnail']="TN_";   
+
+
+//======================================================   
+
+$options['Autosize'] = ''.l10n('Autosize').''; 
+foreach ($defined_types as $type_size){
+  $value = $type_size;
+  $options[$value] = $type_size;   
+}  
+//======================================================     
+        
         $template->assign(
-                                        array(
+                                        array( 
+            'ratio' =>$img_scaled_width/$img_scaled_height ,
+            'cookies' =>  $cookies ,
+            'deriv_type' =>$deriv_type ,
+            'webmaster_type' => array(
+                                            'OPTIONS' => $options,
+                                            'SELECTED' => $autosize_parametres->webmaster_type
+                                            ),
+            'admin_type' => array(
+                                            'OPTIONS' => $options,
+                                            'SELECTED' => $autosize_parametres->admin_type
+                                            ),
+            'generic_type' => array(
+                                            'OPTIONS' => $options,
+                                            'SELECTED' => $autosize_parametres->generic_type
+                                            ),
+            'guest_type' => array(
+                                            'OPTIONS' => $options,
+                                            'SELECTED' => $autosize_parametres->guest_type
+                                            ),
+            'normal_type' => array(
+                                            'OPTIONS' => $options,
+                                            'SELECTED' => $autosize_parametres->normal_type
+                                            ),
             'DEBUG_autosize' =>  $DEBUG_autosize   ,
             'cl_visible' =>  $cl_visible,
@@ -56 +127 @@
             'theme' => $theme,
             'SCALED_WIDTH' => $img_scaled_width,
-            'SCALED_HEIGHT' => $img_scaled_height,                    
+            'SCALED_HEIGHT' => $img_scaled_height,      
+                          
             'IMG_WIDTH'         => $img_width,
             'IMG_HEIGHT'        => $img_height,
@@ -68 +140 @@
             'ECHELLE_MAX' => $autosize_parametres->echelle_max,
 
-            'check_auto_w' => ($autosize_parametres->check_auto_w == 'on') ? 'checked="checked"'  : '' ,
-            'check_icon_v' => ($autosize_parametres->check_icon_v == 'on') ? 'checked="checked"'  : '' ,
+       
+            'check_icon_v' => ($autosize_parametres->check_icon_v == 'on') ? 'checked="checked"'  : ''  ,
             'check_desc_v' => ($autosize_parametres->check_desc_v == 'on') ? 'checked="checked"'  : '' ,
 
-            'webmaster_width' => $autosize_parametres->webmaster_width,
-            'webmaster_height' => $autosize_parametres->webmaster_height,
+
             'webmaster_enabled' => ($autosize_parametres->webmaster_enabled == 'on') ? 'checked="checked"'  : '' ,
-
-            'admin_width' => $autosize_parametres->admin_width,
-            'admin_height' => $autosize_parametres->admin_height,
             'admin_enabled' => ($autosize_parametres->admin_enabled == 'on') ? 'checked="checked"'  : '' ,
-
-            'generic_width' => $autosize_parametres->generic_width,
-            'generic_height' => $autosize_parametres->generic_height,
             'generic_enabled' => ($autosize_parametres->generic_enabled == 'on') ? 'checked="checked"'  : '' ,
-
-            'guest_width' => $autosize_parametres->guest_width,
-            'guest_height' => $autosize_parametres->guest_height,
-            'guest_enabled' => ($autosize_parametres->guest_enabled == 'on') ? 'checked="checked"'  : '' ,
-                                 
-            'normal_width' => $autosize_parametres->normal_width,
-            'normal_height' => $autosize_parametres->normal_height,
+            'guest_enabled' => ($autosize_parametres->guest_enabled == 'on') ? 'checked="checked"'  : '' ,      
             'normal_enabled' => ($autosize_parametres->normal_enabled == 'on') ? 'checked="checked"'  : '' ,