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

Timestamp:

Apr 26, 2013, 1:51:34 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize update to piwigo 2.5 (fix bugs in admin )

File:

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

extensions/Autosize/autosize.inc.php

@@ -773 +773 @@
                 $defined_types = array_keys(ImageStdParams::get_defined_type_map());
                 foreach($defined_types as $type){
+                if(preg_match("|get_infos|", $DEBUG_autosize, $val)) $infos_message .= "$type, " ;
                         if($type!="Autosize" && $type!="SelMaxi" ){
                                 $last_derivative= $type ;
@@ -805 +806 @@
                  
                 if(preg_match("|get_infos|", $DEBUG_autosize, $val))
-                        $infos_message .= "<br> get_min_max() $theMainImageWidth,$theMainImageHeight,$theContainerWidth,$theContainerHeight <br>" ;
-
-                foreach ($img_all as $img_select){
-
+                        $infos_message .= "<br> get_min_max() $pictureSelType $theMainImageWidth,$theMainImageHeight,$theContainerWidth,$theContainerHeight <br>" ;
+                foreach ($img_all as $img_select){
                         $img_type  =  $img_select->get_type();
-                        $img_url  = $img_select->get_path();
+      $img_url  = $img_select->get_path();
+      if ($img_type=="square" || $img_type=="thumb" ) continue ;
                         $max_crop = 0 ;
                         $imgWH  =  self::Get_Size($img_select);
-                        if ($img_type=="square" || $img_type=="thumb" ) continue ;
+                  if(preg_match("|get_infos|", $DEBUG_autosize, $val)){
+                            $infos_message .= " $img_type $img_url ";
+          $infos_message .=   $theImage_def. " Maxi:" . $theImage_maxi. " Mini:" . $theImage_mini;
+          }
+
                         if($img_type=="Autosize" || $img_type=="SelMaxi"){
-                                $theImage_def +=1 ;
-                                continue;
+                                $theImage_def +=1 ;
+                                continue; 
                         }
                         if(!file_exists(PHPWG_ROOT_PATH.$img_url)){
@@ -823 +827 @@
                                 if(preg_match("|get_infos|", $DEBUG_autosize, $val))
                                         $infos_message .= " File: $nofile  <br>" ;
-                        }
-                                
-                        if(file_exists(PHPWG_ROOT_PATH.$img_url)){
-                        } // if file
-
+                          }
                         if ($theImage_def==0){
                                 // Avant Autosize ou Original;
                                 if($img_type=="Original") {
-                                        $theImage_def = 1;
-                                        $theImage_maxi=1;
-                                        $theImage_mini=1;
+                                        $theImage_def  += 1;
+                                        $theImage_maxi += 1;
+                                        $theImage_mini += 1;
                                         if($ok==0){
                                                 $last_image->type=$img_type;
@@ -840 +840 @@
                                         }
                                 }else{
-                                        $last_derivative=$img_type ;
-                                        $last_image=  $img_select;
+                                        $last_derivative = $img_type ;
+                                        $last_image      = $img_select;
                                 }
                         }
-                        if ($theImage_maxi==0){
-                                $maxi_image=  $img_select;
-                        }
-                        if ($theImage_mini==0){
+                        if ($theImage_maxi == 0){
+                                $maxi_image =  $img_select;
+                        }
+                        if ($theImage_mini == 0){
                                 $mini_image=  $img_select;
                         }
@@ -859 +859 @@
                         }
                         if( $img_type=="Original" && $theImage_def==0 ){
-                                $theImage_def=1;
+                                $theImage_def +=1;
                                 $img_type = $last_derivative ;
-                                $img_url= $derivative->get_path();
-                                $imgWH = $derivative->get_size();
+                                $img_url=   $derivative->get_path();
+                                $imgWH =    $derivative->get_size();
 
                                 $default_image->type=$img_type;
@@ -869 +869 @@
 
                         }
-                        $test=$imgWH[1] >=  $theMainImageHeight;
+                        $test= ($imgWH[1] >=  $theMainImageHeight);
                          if($has_pamoorama!=true){
                                 $test=( $imgWH[0] >=  $theMainImageWidth) && $test;             
-                         }
+                         }      
                                 //===================================================
-                        if($theImage_maxi==0)
-                                if( $test==true  ){
-                                                $theImage_maxi=1;
+        if( $test==true  ){
+                                                $theImage_maxi +=1;
                                                 $maxi_image->type =   $img_type;
                                                 $img_type=$img_select->get_type();
-                                if($img_type=="Original")
-                                        $maxi_image = $last_image;
-                                else
-                                        $maxi_image = $img_select;
-                                        
-                                $maxi_image->url  =  $maxi_image->get_path();
-
-                        } else {
-
-                                $mini_image->type=$img_type;
-                                $mini_image->url=$img_url;
-                                $mini_image=$img_select;
-                                $mini_image->url  =  $mini_image->get_path();
-                        }
+                                    if($img_type=="Original")
+                                              $maxi_image = $last_image;
+                                    else
+                                             $maxi_image = $img_select;         
+                                
+                                    $maxi_image->url  =  $maxi_image->get_path();
+                          } else {
+                                  $mini_image->type=$img_type;
+                                  $mini_image->url=$img_url;
+                                  $mini_image = $img_select;
+                                  $mini_image->url  =  $mini_image->get_path();         
+                          }
+     
+
                         if(preg_match("|get_infos|", $DEBUG_autosize, $val)){
-                                if (($imgWH[1] >= $theMainImageHeight))  $infos_message .="<span style='color:red'>";
-                        
-                                $infos_message .= ($imgWH[1] >= $theMainImageHeight)."  Maxi:" . $maxi_image->url 
-                                         . " ---------- ImageUrl: $img_url " 
+                                if($test)  $infos_message .="<span style='color:red'>";                 
+                                $infos_message .= "  Maxi_Url :" . $maxi_image->url 
+                                         . "  ImageUrl: $img_url " 
+                       . "  Mini_Url :" . $mini_image->url 
                                          . $max_crop ." -> " . $img_type . " <br>" 
                                                 . print_r($imgWH,true). " <br >";
-                                if ($test)  $infos_message .="</span >";                                
+                                if ($test)  $infos_message .="</span >";                
+
                                 }
                 } // for
@@ -907 +907 @@
                 $img_url = $img_select->src_image->get_url();
                 $imgSizeWH  =  $img_select->src_image->get_size();
-                $liste_type["Original"]="Original".",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ;
+    if(isset($liste_type["SelMaxi"])) die();
+    $liste_type["SelMaxi"] = "SelMaxi".",".$img_url.",".$imgSizeWH[0]  .",".$imgSizeWH[1] ;
+    $liste_type["Autosize"] = "Autosize".",".$img_url.",".$imgSizeWH[0]  .",".$imgSizeWH[1] ;
+                $liste_type["Original"] = "Original".",".$img_url.",".$imgSizeWH[0] .",".$imgSizeWH[1] ;
 
                 $retour=(object)'' ;
-                if ($pictureSelType=="Autosize") $retour= $maxi_image ;
-                else if ($pictureSelType=="SelMaxi") $retour= $mini_image ;
+                if ($pictureSelType=="Autosize")      $retour = $maxi_image ;
+                else if ($pictureSelType=="SelMaxi")  $retour = $mini_image ;
                 else{
                         $types = array_intersect(array_keys($liste_type), array($pictureSelType));
@@ -917 +920 @@
                                 $pictureSelType="Original";
                         }
-                        $retours=  explode(",",$liste_type[$pictureSelType]);
-                        $retour=$SelType_image;
+                        $retours =  explode(",",$liste_type[$pictureSelType]);
+                        $retour  =  $SelType_image;
                         $retour->type=$retours[0];
                         $retour->url=$retours[1];
@@ -927 +930 @@
                         $retour->type =  $retour->get_type();
                         $retour->url  =  $retour->get_path();
-
                 }
                 if (isset( $retour->type) && $retour->type=="Original" ){
@@ -941 +943 @@
                 if(preg_match("|get_minfos|", $DEBUG_autosize, $val))
                         $infos_message .= $pictureSelType . " -> " . $retour->type . " : "  .
-                                        $retour->url  .
+                                        $retour->url  .cl_print_var($liste_type) . 
                                  cl_print_var($retour->get_size()) .  "<br >";