Changeset 18115 for extensions/Autosize/autosize.inc.php

Timestamp:

Sep 21, 2012, 10:54:57 AM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, fix bug

File:

• extensions/Autosize/autosize.inc.php (modified) (7 diffs)

extensions/Autosize/autosize.inc.php

@@ -37 +37 @@
  // header ('X-UA-Compatible: IE=Edge')  ; 
  global  $template,$version,$icon_path,$page,$picture,$conf;
-
-   $current = $template->get_template_vars('current'); 
-
-   $model=  $_COOKIE['picture_deriv'] ;
+  
+   $current = $template->get_template_vars('current');  
       $has_pamoorama=isset($template->files['pamooramics_content']);
  //====================================================================    
     $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 
     $SRC_IMG=""; 
-       $selected_derivative =  $current['derivatives'][$pictureDeriv];
-        if (!isset($current['selected_derivative'])){  
+    if(isset($current['derivatives']['Autosize']))
+       $_COOKIE['picture_deriv']="Autosize";
+   if(isset( $_COOKIE['picture_deriv']))
+      $model=  $_COOKIE['picture_deriv'] ;
+   else
+      $model= $pictureDeriv ;
+
+   $selected_derivative =  $current['derivatives'][$model];
+   if (!isset($current['selected_derivative'])){  
+
+   $_COOKIE['picture_deriv']="Autosize";
+    $model=  $_COOKIE['picture_deriv'] ;
+         $current['SelMaxi']=ImageStdParams::get_custom(900,900); 
+         $current['derivatives'][$model]=ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 
+
+
+$selected_derivative=$current['derivatives'][$model];
+$selected_derivative->type="Autosize";
           $template->append('current', array(
                                         'selected_derivative' => $selected_derivative
@@ -53 +67 @@
           $current = $template->get_template_vars('current');
         }
-
+ 
         if(isset($current['derivatives'][$model])) {
             $selected_derivative =  $current['derivatives'][$model];
@@ -60 +74 @@
             $current = $template->get_template_vars('current'); 
         }
-   
+
     return $content;
 
@@ -85 +99 @@
     }  
   $current = $template->get_template_vars('current'); 
-                       if (!isset($current)) return ;
+  if (!isset($current)) return ;
 //===============================================================
     $derivative = $current['src_image'] ;
@@ -95 +109 @@
     $picture['current']['image_url']=$SRC_IMG;  
 //===============================================================
-
+ 
     $user_status = $user['status'] ;
     $autosize_parametres = cl_autosize_Get_Options();
@@ -130 +144 @@
         $model=$conf['derivative_default_size'] ;  
     }
-  $derivative=$current['derivatives'][$model] ;  
+    $derivative=$current['derivatives'][$model] ;  
     $img_all= $derivative->get_all($derivative->src_image);
     $maxi_img="";
@@ -143 +157 @@
 
    
-    $window_width = pwg_get_session_var('theMainImageWidth',$imgSizeWH[0]); 
+   $window_width = pwg_get_session_var('theMainImageWidth',$imgSizeWH[0]); 
  $window_height =  pwg_get_session_var('theMainImageHeight',$imgSizeWH[1]);
 
- if (!isset($_COOKIE['theMainImageHeight']))    setcookie('theMainImageHeight', $window_height ); 
+if (!isset($_COOKIE['theMainImageHeight']))    setcookie('theMainImageHeight', $window_height ); 
 if (!isset($_COOKIE['theMainImageWidth']))  setcookie('theMainImageWidth',$window_width); 
 
-  //  echo "<div style='background-color:black;color:white' >$select_type w: $window_width x h: $window_height  </div>";
+//echo "<div style='background-color:black;color:white' >$select_type w: $window_width x h: $window_height  </div>";
 
     $last_defined=ImageStdParams::get_defined_type_map();    
+
     foreach ($img_all as $img_select){
             $img_type  =  $img_select->get_type();      
             if ($img_type=="square" || $img_type=="thumb" ) continue ;
-
+            if (!isset($last_img)) $last_img=$img_select; 
             $img_url  = $img_select->get_url();
             $imgSizeWH  =  $img_select->get_size();