Changeset 19156 for extensions

Timestamp:

Nov 24, 2012, 3:25:53 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (whith stripped white bloc )

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (4 diffs)
• js/Affiche_script.js (modified) (3 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -62 +62 @@
           unset (  $_COOKIE['autosize_reload']) ;
     }
-
+    if(preg_match("|test|", $DEBUG_autosize, $val)) { 
+    $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) ;
+        $infos_message .=  "GET:"  . cl_print_var($_GET) ;
+        $infos_message .= "POST:"  . cl_print_var($_POST) ;
+        $infos_message .= "$pictureDeriv $pictureSelType $pictureMap ";
+      //  die("#138: ".$DEBUG_autosize);
+ }
     if(!isset($_COOKIE['picture_deriv'] )){
+        if(preg_match("|test_1|", $DEBUG_autosize, $val)) { 
+          $infos_message .= "not COOKIE['picture_deriv'] -> reload(): <br>";
+          echo $infos_message;
+          die("#78 autosize_calcContent:" . $DEBUG_autosize);
+        }
        self::reload();
-       die("#76 autosize_calcContent:" . $DEBUG_autosize);
-    }
+            die("#80 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;
+          die("#89 autosize_calcContent:" . $DEBUG_autosize);
+        }
            self::reload();
             die("#82 autosize_calcContent:" + $DEBUG_autosize);
@@ -131 +150 @@
  //==============================================================
  if(preg_match("|test|", $DEBUG_autosize, $val)) { 
-    echo "Init:SESSION:"  . cl_print_var($_SESSION) ;
+    $infos_message .= "#133 <br>Init:SESSION:"  . cl_print_var($_SESSION) ;
        if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
-        echo "Init: COOKIE:"  . cl_print_var($_COOKIE) ;
-        echo "GET:"  . cl_print_var($_GET) ;
-        echo "POST:"  . cl_print_var($_POST) ;
-        echo "$pictureDeriv $pictureSelType $pictureMap ";
-      //  die("#135: ".$DEBUG_autosize);
+        $infos_message .=  "GET:"  . cl_print_var($_GET) ;
+        $infos_message .= "POST:"  . cl_print_var($_POST) ;
+        $infos_message .= "$pictureDeriv $pictureSelType $pictureMap ";
+      //  die("#138: ".$DEBUG_autosize);
  }
   $autosize_parametres = cl_autosize_Get_Options();
@@ -185 +203 @@
  
  if(preg_match("|test|", $DEBUG_autosize, $val)) { 
-    echo "Init:SESSION:"  . cl_print_var($_SESSION) ;
-    echo $infos_message ;
+    $infos_message .=  "#187 <br>Init:SESSION:"  . cl_print_var($_SESSION) ;
+   
     if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
-        echo "Init: COOKIE:"  . cl_print_var($_COOKIE) ;
-        echo "GET:"  . cl_print_var($_GET) ;
-        echo "POST:"  . cl_print_var($_POST) ;
-     echo ("#201: ".$DEBUG_autosize);
+        $infos_message .=  "Init: COOKIE:"  . cl_print_var($_COOKIE) ;
+        $infos_message .=  "GET:"  . cl_print_var($_GET) ;
+        $infos_message .=  "POST:"  . cl_print_var($_POST) ;      
+        $infos_message .=("#193: ".$DEBUG_autosize);
  }
  $pattern = array();
@@ -649 +667 @@
 
 }
-   cl_aff_infos_plus();
+ 
    if(preg_match("|test|", $DEBUG_autosize, $val)) { 
-    echo "cl_autosize_affiche:_COOKIE:"  . cl_print_var($_COOKIE) ;
-    echo $infos_message ;
+    $infos_message .= "#653 <br>cl_autosize_affiche:_COOKIE:"  . cl_print_var($_COOKIE) ;    
     $pictureMap=$_COOKIE['picture_map'];
-    echo "SelType:" . $pictureSelType." pictureDeriv:".$pictureDeriv ." pictureMap:".$pictureMap;
-    die ("#710: ".$DEBUG_autosize);
- }
+    $infos_message .= "<br />SelType:" . $pictureSelType."; pictureDeriv:".$pictureDeriv ."; pictureMap:".$pictureMap;
+    echo $infos_message;
+    die ("#657: ".$DEBUG_autosize);
+ }  
+       cl_aff_infos_plus();
         return $template->parse( 'autosize_content', false);
         } //public function cl_autosize_affiche

extensions/Autosize/js/Affiche_script.js

@@ -368 +368 @@
 
       infos_theImage = jQuery(theImage_id).infos(true);                 // conteneur
-
-
+      if (options.pictureSelType != "Autosize" && options.pictureSelType != "SelMaxi") {
+        jQuery('#derivativeSwitchLink').show();
+      }
       if (test_theme("simple")) {
         jQuery(theMainImage_id).css({ maxWidth: "none" });
@@ -893 +894 @@
     ***************************/
     Autosize_resize = function (force, parametres) {
+
       nAuto = Get_dimensions(true, options);
 
       Save_cookies(options);
       if (!options.valide || nAuto == false || (options.pictureSelType != "Autosize" && options.pictureSelType != "SelMaxi")) {
+        if (options.imageAutosize == true) {
+          options.pictureSelType = options.pictureDeriv;
+        Zone_image.image_init.width = jQuery(theImg).width();
+        Zone_image.image_init.height = jQuery(theImg).height();
+          set_cl("no");
+          Set_llbgo(true);
+          return;
+        }
         jQuery(theImg).width(Zone_image.image_init.width);
         jQuery(theImg).height(Zone_image.image_init.height);
@@ -2263 +2273 @@
 
 
-  });                                                                                                         // ready
+  });                                                                                                               // ready
 
 

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 3.0.1
+Version: 3.0.2
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448

extensions/Autosize/maintain.inc.php

@@ -81 +81 @@
          unset ( $conf['cl_derivatives_sav']);    
       }   
-      $model= $conf['derivative_default_size'];
+    
+      if($conf['derivative_default_size']=="Autosize" || $conf['derivative_default_size']=="SelMaxi")
+      $conf['derivative_default_size']="medium";
+  $model= $conf['derivative_default_size'];
+
       $_COOKIE  ['picture_deriv'] = $model;  
       pwg_set_session_var('picture_deriv', $model);