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

Timestamp:

Sep 25, 2012, 12:36:16 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, store typesize

File:

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

extensions/Autosize/autosize.inc.php

@@ -38 +38 @@
  global  $template,$version,$icon_path,$page,$picture,$conf;
   
-$current = $template->get_template_vars('current');  
+  $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";
+  $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 
+  $default_size =  $conf['derivative_default_size'];
+  $SRC_IMG=""; 
+//=====================================================================
+if(!isset($_COOKIE['picture_deriv']))
+    if(isset($current['derivatives']['Autosize']))
+        $_COOKIE['picture_deriv']="Autosize";
+
 if(isset( $_COOKIE['picture_deriv']))
   $model=  $_COOKIE['picture_deriv'] ;
@@ -50 +54 @@
   $model= $pictureDeriv ;
 
+ if(!isset($current['derivatives'][$model]))
+   $model=$default_size ;
+
 $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";
+
+  $current['SelMaxi'] = ImageStdParams::get_custom(900,900); 
+  $selected_derivative = ImageStdParams::get_custom($_COOKIE['theImageWidth'], $_COOKIE['theImageHeight']); 
+ 
+  $selected_derivative->type=$model;
   $template->append('current', array(
                                 'selected_derivative' => $selected_derivative
@@ -63 +71 @@
                       true);
   $current = $template->get_template_vars('current');
+   
   }
  
@@ -138 +147 @@
       
     }else{
-        $model=$conf['derivative_default_size'] ;  
+        $model=$conf['derivative_default_size'] ;  // format par défaut
     }
     $derivative=$current['derivatives'][$model] ;  
@@ -150 +159 @@
      $window_width=$imgSizeWH[0];
      $window_height=$imgSizeWH[1];
- //echo "<div style='background-color:black;color:white' >INIT: $model  w:$window_width x  h:$window_height  </div>";
+
 
    
@@ -159 +168 @@
 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>";
-
-    $last_defined=ImageStdParams::get_defined_type_map();    
-
+//
+
+    $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; 
+            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"){
@@ -175 +184 @@
                 $imgSizeWH  =  $img_select->src_image->get_size();
                 $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"){    
-                          $maxi_img=  $img_type;
-                          $maxi_url= $img_url;
-                          $maxi_i=$img_select;      
-                break ;
-
-
-            }
-            
-               
-
+ 
               if($window_height < $imgSizeWH[0] ){
                           $maxi_img=  $img_type;
@@ -193 +193 @@
                           $maxi_i=$img_select;
               }
+
               if($window_height < $imgSizeWH[0] && $mini_img==""){ 
                       $mini_img=  $img_type;
                       $mini_url= $img_url;
                       $mini_i=$img_select;
-                      
-                 }else if($imgSizeWH[0] > 10 && $maxi_img==""){ 
-                      $last_img=$img_select;
-              }
-
- 
-               if($select_type==$img_type){ 
+                 }
+
+               if($select_type == $img_type){ 
                   if($maxi_img==""){
-                      $maxi_img=  $img_type;
-                      $maxi_url= $img_url;
-                      $maxi_i=$img_select;
-                  }
-                     
-                      break ;
-                    }
-         }
-
+                      $maxi_img =  $img_type;
+                      $maxi_url =  $img_url;
+                      $maxi_i   = $img_select;
+                  } 
+                  if($mini_img==""){
+                      $mini_img=  $img_type;
+                      $mini_url= $img_url;
+                      $mini_i=$img_select;
+                  }                    
+               break ;
+                }
       }
-  
 //==============================================================    
   //==== Réécriture selection ====
   if( $img_type=="SelMaxi"){
-  $maxi_img= $mini_img;
-  $maxi_url= $mini_img;
+      $maxi_img= $mini_img;
+      $maxi_url= $mini_img;
   }
   if ( !array_key_exists($maxi_img, $last_defined) ){
+   
             $maxi_img = $last_img->get_type();   
             $maxi_url  = $last_img->get_url();
             $imgSizeWH  =  $last_img->get_size();       
+ 
   }
-    $model= $maxi_img;
-    pwg_set_session_var('picture_deriv', $maxi_img);
-    $_COOKIE['picture_deriv']=$maxi_img ;
+ $model= $maxi_img;
+   
+  /*  $_COOKIE['picture_deriv']=$maxi_img ;
     $_COOKIE['picture_map']=  $maxi_img ;
     $_COOKIE['imgSrc']=       $maxi_url;
-
+   */
   if (isset($_COOKIE['picture_deriv'])){    
       if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) ){
-            pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
+   //         pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
         }else{
-       /* echo "<pre>".$_COOKIE['picture_deriv']. "No exist  " ;
-        print_r($img_all );
-        die();
-        */
+     //       pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
         }
-    setcookie('picture_deriv', false, 0, cookie_path() );
+  //  setcookie('picture_deriv', false, 0, cookie_path() );
   }  
 
@@ -254 +251 @@
 *************************/      
         static public function cl_autosize_affiche(){
-                global $user, $picture, $template,$page,$known_script;
-                global $content, $element_info;   
-                global $infos_message,$erreur_message;
-                global  $conf,$lang ,$user,$userdata;
-      global $defined_types,$maxi_img ,$pictureDeriv ,$liste_type,$SRC_IMG,$select_type;
-  global  $has_pamoorama;
-  global $autosize_parametres,$user_status;
+    global $user, $picture, $template,$page,$known_script;
+    global $content, $element_info;   
+    global $infos_message,$erreur_message;
+    global  $conf,$lang ,$user,$userdata;
+    global $defined_types,$maxi_img ,$pictureDeriv ,$liste_type,$SRC_IMG,$select_type;
+    global  $has_pamoorama;
+    global $autosize_parametres,$user_status;
+  
 
     if(isset($page['body_id']) &&       $page['body_id'] == 'theAdminPage' ) return ;   
@@ -270 +268 @@
                 $AUTOSIZE_PATH = dirname(__FILE__).'/';
                  if (isset( $page['body_id']) && $page['body_id']=='thePicturePage'  ) {
-
                         if ( isset($picture['current'])){       
                                 include (AUTOSIZE_PATH."include/affiche.php"); 
@@ -285 +282 @@
         $file =AUTOSIZE_PATH_ABS.'template/header.tpl' ;
         $template->set_filenames(array('autosize_init_header'=> $file ));
-        $template->parse( 'autosize_init_header', false);      
-
-                $theme=$user['theme'];  
-                                        
+        $template->parse( 'autosize_init_header', false);  
+        $theme=$user['theme'];  
+                                
                                 if($autosize_parametres->check_icon_v == 'on'){                          
                                                 $template->assign('cl_autosize_button', 
@@ -308 +304 @@
              'theme' => $theme   )
                                         );
-                        $template->concat('autosize_content', $template->parse('autosize_content_header', true));       
-        
+                        $template->concat('autosize_content', $template->parse('autosize_content_header', true));               
       if(isset($conf['go_up_down']) && ($conf['go_up_down']==true) ){
         $template->set_filenames(array('mes_script' => realpath(AUTOSIZE_PATH).'/template/mes_scripts.tpl') );