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

Timestamp:

Jan 5, 2013, 4:14:21 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix bug crop

File:

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

extensions/Autosize/autosize.inc.php

@@ -66 +66 @@
     }
     if(preg_match("|test|", $DEBUG_autosize, $val)) { 
-    $infos_message .= "#65 autosize_calcContent: <br>";
-       if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
+        $infos_message .= "#65 autosize_calcContent: <br>";
+        if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
         $infos_message .=  "SESSION:"  . cl_print_var($_SESSION) ;
         $infos_message .=  "COOKIE:"  . cl_print_var($_COOKIE) ;
@@ -80 +80 @@
           self::Fin_php("#80 autosize_calcContent:" . $DEBUG_autosize );
         }
-        self::reload("#82");
-        self::Fin_php("#83 autosize_calcContent:" + $DEBUG_autosize);
-    }  
-
-
-   if (!isset($_COOKIE['autosize_reload'])  ){  
-           if(preg_match("|test_2|", $DEBUG_autosize, $val)) { 
-          $infos_message .= "not COOKIE['autosize_reload'] -> reload(): <br>";
-           echo $infos_message;
-          self::Fin_php("#91 autosize_calcContent:" . $DEBUG_autosize);
+        unset($_COOKIE['autosize_reload']);
+    } 
+    if (!isset($_COOKIE['autosize_reload'])  ){  
+        if(preg_match("|test_2|", $DEBUG_autosize, $val)) { 
+          $infos_message .= "not COOKIE['autosize_reload'] -> reload(): <br>";           
+          self::Fin_php("#87 autosize_calcContent:" . $DEBUG_autosize);
         }
-          self::reload("#93");
-          self::Fin_php("#94 autosize_calcContent:" + $DEBUG_autosize);
+          self::reload("#89");
+      //  self::Fin_php("#90 autosize_calcContent:" + $DEBUG_autosize);
 
     }  
@@ -120 +116 @@
 * INIT
 *********************/
-
+static public function init_3(){
+ 
+}
 static public function init_1($content, $image)
                 {
@@ -128 +126 @@
        if ( !stristr($image['name'], $asp['in_mode_360']) and !stristr($image['name'], $asp['in_mode_180']) ) return $content;
 
-       $windowWidth=$_COOKIE['windowWidth'] -$_COOKIE['theImageLeft']-$_COOKIE['theImageRight'];
-       $windowHeight=$_COOKIE['windowHeight']-130 ;
+      $asp['min_viewport_width']=$_COOKIE['windowWidth'] -$_COOKIE['theImageLeft']-$_COOKIE['theImageRight'];
+          $asp['viewport_height']=$_COOKIE['windowHeight']-130 ;
 
       $asp['start_position']= 10;     
-           $asp['min_viewport_width']= $windowWidth;     
-            $asp['viewport_height']= $windowHeight;     
+  
       }
-
+/*********************/
 static public function init($content,$element_info){
   global  $template,$version,$icon_path,$page,$picture,$conf;
@@ -914 +911 @@
 //================= Liste =========================   
   $ok= 0 ;
-  $nofile=0 ;  
+  $nofile=0 ;      global $max_crop;
   //=============================================
   // Liste mini maxi
   //=============================================
     foreach ($img_all as $img_select){
+
             $img_type  =  $img_select->get_type();      
             $img_url  = $img_select->get_path();     
-            $imgWH  =  $img_select->get_size();    
+              $max_crop = 0 ;
+            $imgWH  =  self::Get_Size($img_select);        
             if ($img_type=="square" || $img_type=="thumb" ) continue ;   
             if($img_type=="Autosize" || $img_type=="SelMaxi"){
@@ -934 +933 @@
             }          
              if(preg_match("|get_minfos|", $DEBUG_autosize, $val)) 
-                      $infos_message .=$img_url . " -> " . $img_type ."<br >";
+                      $infos_message .=$img_url . " " . $max_crop ." -> " . $img_type . " " . print_r($imgWH,true). " <br >";
 
           if(file_exists(PHPWG_ROOT_PATH.$img_url)){    } // if file        
@@ -1048 +1047 @@
 
   }
+  //=================================================================
+
+static public function Get_Size($Img_Select){
+      global  $max_crop;
+             $imgWH  =  $Img_Select->get_size();          
+            $img_type  =  $Img_Select->get_type();         
+              $smaller = ImageStdParams::get_by_type($img_type);    
+              $max_crop=0;
+              if($smaller->sizing->max_crop==1){
+                $imgWH  =$smaller->sizing->min_size;
+                 $max_crop=1;
+          }      
+          return $imgWH ;
+      }
 //==================================================================
 static public  function  cl_autosize_nofile($img_all){