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

Timestamp:

Sep 22, 2012, 11:46:42 AM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, fix bug

File:

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

extensions/Autosize/autosize.inc.php

@@ -38 +38 @@
  global  $template,$version,$icon_path,$page,$picture,$conf;
   
-   $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=""; 
-    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
-                                            ), 
-                             true);
-          $current = $template->get_template_vars('current');
-        }
- 
-        if(isset($current['derivatives'][$model])) {
-            $selected_derivative =  $current['derivatives'][$model];
-            $template->assign('current[selected_derivative]', $selected_derivative
-                              , true);
-            $current = $template->get_template_vars('current'); 
-        }
-
-    return $content;
+$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=""; 
+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
+                                    ), 
+                      true);
+  $current = $template->get_template_vars('current');
+  }
+ 
+  if(isset($current['derivatives'][$model])) {
+    $selected_derivative =  $current['derivatives'][$model];
+    $template->assign('current[selected_derivative]', $selected_derivative , true);
+    $current = $template->get_template_vars('current'); 
+  }
+
+return $content;
 
 }//INIT
@@ -171 +167 @@
             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();     
+
             if($img_type=="Autosize" || $img_type=="SelMaxi"){
                 $img_url = $img_select->src_image->get_url();
@@ -178 +176 @@
                 $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ;
             }else{ 
-            $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ;
-            if ($img_type=="Original"){
-          
-            break ;
+              $liste_type[$img_type]=$img_type.",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ;
+              if ($img_type=="Original"){    
+                          $maxi_img=  $img_type;
+                          $maxi_url= $img_url;
+                          $maxi_i=$img_select;      
+                break ;
+
+
             }
             
@@ -235 +237 @@
             pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
         }else{
-        echo "<pre>".$_COOKIE['picture_deriv']. "No exist  " ;
+       /* echo "<pre>".$_COOKIE['picture_deriv']. "No exist  " ;
         print_r($img_all );
         die();
+        */
         }
     setcookie('picture_deriv', false, 0, cookie_path() );
@@ -262 +265 @@
 
  if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ;
+     if ('stripped' == $user['theme'] ) return ;
+
                 load_language('plugin.lang', AUTOSIZE_PATH);
                 $AUTOSIZE_PATH = dirname(__FILE__).'/';
@@ -318 +323 @@
         return $template->parse( 'autosize_content', false);
                                   }
-                }
+                } 
 
         } //public function cl_autosize_affiche
@@ -335 +340 @@
     $has_pamoorama=isset($template->files['pamooramics_content']);
   if (!$has_pamoorama) return ; 
+      if ('stripped' == $user['theme'] ) return ;
 
     $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );
@@ -372 +378 @@
      global  $has_pamoorama;
        if (!$has_pamoorama) return ; 
-      
+       if ('stripped' == $user['theme'] ) return ;
+
                         $AUTOSIZE_PATH = dirname(__FILE__).'/';
 //================================================================