Changeset 17503 for extensions/Autosize/include

Timestamp:

Aug 9, 2012, 8:35:17 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, update

File:

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

extensions/Autosize/include/affiche.php

@@ -1 +1 @@
 <?php  
-$visible=(isset($visible))?$visible:false;
 
+$visible=(isset($visible))?$visible:false; 
 $cl_version=isset($cl_version)?$cl_version:"";
 $cl_plugin=isset($cl_plugin)?$cl_plugin:"";
 $cl_visible=isset($conf['cl_auto']) ? $conf['cl_auto'] : 
-(isset($_GET['cl_visible'])?$_GET['cl_visible']:'true')
+(isset($_GET['cl_visible'])?$_GET['cl_visible']:'true'); 
+//==============================================================================
+$DEBUG_autosize = isset($_POST['cl_debug']) ? $_POST['cl_debug'] : "false" ;
+$DEBUG_autosize = isset($_GET['cl_debug']) ? $_GET['cl_debug'] : $DEBUG_autosize ;
+$DEBUG_autosize = isset($conf['cl_debug']) ? $conf['cl_debug'] : $DEBUG_autosize ; 
+//===========================================================================
+$cookies="' x '"; 
 
- ; 
-//==============================================================================
-$DEBUG_autosize = isset($_POST['cl_debug_conflit']) ? $_POST['cl_debug_conflit'] : "false" ;
-$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 '";
-
-$current = $template->get_template_vars('current');
-if (isset($_COOKIE['picture_deriv']))
-  {
-  if (isset($_COOKIE['theImageWidth']))
-  $cookies =  '"'.$_COOKIE['theImageWidth']." x ".  $_COOKIE['theImageHeight'] .'"';
-
-    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']);
-  $defined_types = array_keys(ImageStdParams::get_defined_type_map());  
-
-if (isset($current)){ 
-    if (!isset($current['selected_derivative'])){  
-      $model= $defined_types[count($defined_types)-1];
-      $selected_derivative =      $current['derivatives'][$model];
-       $img_all= $derivative->get_all($derivative->src_image);
-      $template->append('current', array(
-      'selected_derivative' => $selected_derivative
-    ), true);
-
-
-    $current = $template->get_template_vars('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 ;
-       
-    } 
-  
 $img_width=isset($imgScaledWH)?$imgSizeWH[0]:"480";
 $img_height=isset($imgScaledWH)?$imgSizeWH[1]:"320";
@@ -61 +18 @@
 $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($_SESSION['windowHeight'])?$_SESSION['windowHeight']: $img_scaled_height ;
+$window_width= isset($_SESSION['windowWidth'])?$_SESSION['windowWidth']: $img_scaled_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    ;
 global $size ;
 $size=  array(
@@ -76 +32 @@
             'window_width' => $window_width
           );
-
+        
   $my_path = AUTOSIZE_PATH_ABS;
   $theme=$user['theme'];
+
+
   $user_status = $user['status'] ;
 
@@ -88 +46 @@
                                                                         );      
 if (!isset($conf['prefix_thumbnail'])) $conf['prefix_thumbnail']="TN_";   
+//======================================================   
+
+//=== type possible ===
+if(isset($defined_types))
+    foreach ($defined_types as $type_size){
+      $value = $type_size;
+      $options[$value] = $type_size;    
+    }  
+
+ //===========================================
+        $template->assign(
+                                        array(  
+            'select_type' =>$select_type,
+            'select_map' =>$select_type,
+
+            'pictureDeriv' =>$pictureDeriv ,
+
+            'maxi_img' =>$maxi_img ,
+            'ratio' =>$img_scaled_width/$img_scaled_height ,          
 
 
-//======================================================   
-
-$options['Autosize'] = ''.l10n('Autosize').''; 
-foreach ($defined_types as $type_size){
-  $value = $type_size;
-  $options[$value] = $type_size;   
-}  
-//===================
-$value=0;
-$liste_type="";
-if(isset($img_all ))
-foreach ($img_all as $img_select){
-          $imgSizeWH  =  $img_select->get_size();       
-          $img_type  =  $img_select->get_type();        
-          $img_url  = $img_select->get_url();  
-
-          $liste_type .= $img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1]."|" ;
-          if(strtolower($img_type)=="original") break ;
-
-
-}  
-
-//===================================     
-        
-        $template->assign(
-                                        array( 
-            'ratio' =>$img_scaled_width/$img_scaled_height ,
-            'cookies' =>  $cookies ,
-            'deriv_type' =>$deriv_type ,
-            'liste_type' => $liste_type ,
             'webmaster_type' => array(
                                             'OPTIONS' => $options,
@@ -150 +97 @@
 
             'theme' => $theme,
+
+            'windowHeight' => $window_height,
+            'windowWidth' =>  $window_width,
+
             'SCALED_WIDTH' => $img_scaled_width,
             'SCALED_HEIGHT' => $img_scaled_height,      
@@ -158 +109 @@
             'MINI_HEIGHT' => $autosize_parametres->mini_height,
             'MINI_WIDTH'        => $autosize_parametres->mini_width,
+
             'MINI_HEIGHT2' => $autosize_parametres->mini_height2,
             'MINI_WIDTH2'       => $autosize_parametres->mini_width2,
@@ -176 +128 @@
 
             'user_status'   => get_user_status($user_status)  ,
-'Size' => $size 
-          
+            'SRC_IMG' => $SRC_IMG,
+            'liste_type' => $liste_type ,
+            'Size' => $size        
                                         
                                  )