Changeset 19003

Timestamp:

Nov 13, 2012, 3:06:06 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4 (fix bugs)

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (30 diffs)
• css/kardon.css (modified) (2 diffs)
• include/affiche.php (modified) (2 diffs)
• js/Affiche_script.js (modified) (35 diffs)
• main.inc.php (modified) (1 diff)
• template/autosize.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -36 +36 @@
 **************************/
  static public function autosize_calcContent($content,$element_info){
- 
-  global $conf,$page, $template,$picture,$user; 
+   global $conf,$page, $template,$picture,$user; 
   global $defined_types,$pictureSelType ,$pictureDeriv ,$liste_type,$SRC_IMG;
   global $autosize_parametres,$user_status;
@@ -52 +51 @@
 }
  if(preg_match("|event|", $DEBUG_autosize, $val))  $infos_message =  "autosize_calcContent, " ; 
- if(preg_match("|test|", $DEBUG_autosize, $val )) { 
-     echo cl_print_var($infos_message) ;
- if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
- echo "COOKIE:"  . cl_print_var($_COOKIE) ;
- echo "GET:"  . cl_print_var($_GET) ;
- echo "POST:"  . cl_print_var($_POST) ;
- die("#60:" . $DEBUG_autosize);
- }
     $ma_page=isset($page['body_id'])?$page['body_id']:"" ;  
    if ($ma_page !='thePicturePage') return ; 
-
-           $types = array_intersect(array_keys(ImageStdParams::get_defined_type_map()), array("Autosize","SelMaxi"));
+    $types = array_intersect(array_keys(ImageStdParams::get_defined_type_map()), array("Autosize","SelMaxi"));
     if (count($types)==0){  
         include_once (AUTOSIZE_PATH.'maintain.inc.php');
@@ -72 +62 @@
           unset (  $_COOKIE['autosize_reload']) ;
     }
-    if(!isset($_COOKIE['windowHeight'] )){
+
+    if(!isset($_COOKIE['picture_deriv'] )){
        self::reload();
-       die("#76" . $DEBUG_autosize);
+       die("#76 autosize_calcContent:" . $DEBUG_autosize);
     }
 
@@ -80 +71 @@
    if (!isset($_COOKIE['autosize_reload'])  ){  
            self::reload();
-            die("#82 :" + $DEBUG_autosize);
+            die("#82 autosize_calcContent:" + $DEBUG_autosize);
 
     }  
@@ -111 +102 @@
   global  $template,$version,$icon_path,$page,$picture,$conf;
   global $user,$Css,$css_slideshow,$css_display,$liste_type;
-  global  $has_pamoorama,$pictureSelType,$pictureDeriv;
+  global  $has_pamoorama,$pictureSelType,$pictureDeriv,$pictureMap;
   global $infos_message,$warnings_message;
 
@@ -135 +126 @@
   $css_slideshow=isset($Css['.Autosize']['slideshow'])?$Css['.Autosize']['slideshow']:"yes"; 
   $css_display= isset($Css['.Autosize']['display'])?$Css['.Autosize']['display']:"block";  
+  $default_size =  $conf['derivative_default_size'];
+//============================================================
+self::get_cookies();
  //==============================================================
-  $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 
-  $default_size =  $conf['derivative_default_size'];
+ if(preg_match("|test|", $DEBUG_autosize, $val)) { 
+    echo "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);
+ }
   $autosize_parametres = cl_autosize_Get_Options();
-//=======================================================================
-$pictureSelType = pwg_get_session_var('picture_sel_type',$pictureSelType);  
+
+//=====================================================================
+  $current = $template->get_template_vars('current'); 
+   //=== Zone affichage ==       
+      $windowWidth=$_COOKIE['windowWidth'] ;
+      $windowHeight=$_COOKIE['windowHeight'] ;
+
+      $theImageTop= isset($_COOKIE['theImageTop'])?$_COOKIE['theImageTop']:0;
+      $theImageLeft=isset($_COOKIE['theImageLeft'])?$_COOKIE['theImageLeft']:0;
+
+       $theImageRight=isset($_COOKIE['theImageRight'])?$_COOKIE['theImageRight']:0;
+       $theImageBottom=isset($_COOKIE['theImageBottom'])?$_COOKIE['theImageBottom']:0;
+
+
+       $theImageMargeWidth=isset($_COOKIE['theImageMargeWidth']) ? $_COOKIE['theImageMargeWidth']:0;
+       $theImageMargeHeight=isset($_COOKIE['theImageMargeHeight'])?$_COOKIE['theImageMargeHeight']:0;
+
+      $theImageMargeHeight -= 2;
+if(isset($_COOKIE['theImageWidth'])){
+       $theImageWidth=    $_COOKIE['theImageWidth'];
+       $theImageHeight=  $_COOKIE['theImageHeight'] ;
+}
+       $theImageWidth=    $windowWidth -  $theImageLeft - $theImageMargeWidth;
+       $theImageHeight=   $windowHeight - $theImageTop  - $theImageMargeHeight ;
+ 
+   if (isset($element_info['is_gvideo']) && $element_info['is_gvideo'] ){
+    $pictureDeriv=$default_size;
+
+   }else{
+
+
+    $retour = self::get_min_max() ; 
+
+    $theMainImageSize = $retour->get_size();
+    $theMainImageWidth=   isset($_COOKIE['theMainImageWidth'])?$_COOKIE['theMainImageWidth']:$theMainImageSize[0];
+    $theMainImageHeight=   isset($_COOKIE['theMainImageHeight'])?$_COOKIE['theMainImageHeight']:$theMainImageSize[1] ;
+
+  if($theImageHeight!=0 && $theImageWidth!=0){
+      $pictureDeriv=$retour->type ;
+   }else{
+      $pictureDeriv=$default_size;
+   }
+}
  
  if(preg_match("|test|", $DEBUG_autosize, $val)) { 
+    echo "Init:SESSION:"  . cl_print_var($_SESSION) ;
     echo $infos_message ;
     if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
@@ -148 +191 @@
         echo "GET:"  . cl_print_var($_GET) ;
         echo "POST:"  . cl_print_var($_POST) ;
-        die("#147: ".$DEBUG_autosize);
+     echo ("#201: ".$DEBUG_autosize);
  }
- 
-
-if(!isset($_COOKIE['picture_sel_type'])){
-   if($autosize_parametres->defaut_type=="off")
-      $pictureSelType = pwg_get_session_var('picture_sel_type',"SelMaxi"); 
-   else
-      $pictureSelType = pwg_get_session_var('picture_sel_type',"Autosize"); 
-        
-}else{
-     $pictureSelType = $_COOKIE['picture_sel_type'] ;
-}
-
-//=====================================================================
-  $current = $template->get_template_vars('current'); 
-   //=== Zone affichage ==       
-      $windowWidth=$_COOKIE['windowWidth'] ;
-      $windowHeight=$_COOKIE['windowHeight'] ;
-
-      $theImageTop= isset($_COOKIE['theImageTop'])?$_COOKIE['theImageTop']:0;
-      $theImageLeft=isset($_COOKIE['theImageLeft'])?$_COOKIE['theImageLeft']:0;
-
-       $theImageRight=isset($_COOKIE['theImageRight'])?$_COOKIE['theImageRight']:0;
-       $theImageBottom=isset($_COOKIE['theImageBottom'])?$_COOKIE['theImageBottom']:0;
-
-
-       $theImageMargeWidth=isset($_COOKIE['theImageMargeWidth']) ? $_COOKIE['theImageMargeWidth']:0;
-       $theImageMargeHeight=isset($_COOKIE['theImageMargeHeight'])?$_COOKIE['theImageMargeHeight']:0;
-
-      $theImageMargeHeight -= 2;
-if(isset($_COOKIE['theImageWidth'])){
-       $theImageWidth=    $_COOKIE['theImageWidth'];
-       $theImageHeight=  $_COOKIE['theImageHeight'] ;
-}
-       $theImageWidth=    $windowWidth -  $theImageLeft - $theImageMargeWidth;
-       $theImageHeight=   $windowHeight - $theImageTop  - $theImageMargeHeight ;
- 
-   if (isset($element_info['is_gvideo']) && $element_info['is_gvideo'] ){
-    $pictureDeriv=$default_size;
-
-   }else{
-
-
-    $retour = self::get_min_max() ; 
-
-    $theMainImageSize = $retour->get_size();
-    $theMainImageWidth=   isset($_COOKIE['theMainImageWidth'])?$_COOKIE['theMainImageWidth']:$theMainImageSize[0];
-    $theMainImageHeight=   isset($_COOKIE['theMainImageHeight'])?$_COOKIE['theMainImageHeight']:$theMainImageSize[1] ;
-
-  if($theImageHeight!=0 && $theImageWidth!=0){
-      $pictureDeriv=$retour->type ;
-   }else{
-      $pictureDeriv=$default_size;
-   }
-}
-//============================================================
-  pwg_set_session_var('picture_deriv',$pictureDeriv);
-  setcookie( 'picture_deriv',
-            $pictureDeriv,
-            0,
-            cookie_path() 
-          );
-//============================================================
-pwg_set_session_var('picture_sel_type',$pictureSelType);
-  setcookie( 'picture_sel_type',
-            $pictureSelType,
-            0,
-            cookie_path() 
-          );
-//=============================================================
-$_COOKIE['picture_sel_type']=$pictureSelType;
-$_COOKIE['picture_deriv']=$pictureDeriv;
-
  $pattern = array();
   if($has_pamoorama=="true"){ 
@@ -255 +226 @@
       $content=str_replace( "<object" , "<object id='theMainImage_obj' name='theMainImage' "  ,$content,$ncount);
       $content=str_replace( "<embed" ,  "<embed id='theMainImage_emb' name='theMainImage' "  ,$content,$ncount);
-      $content=str_replace( 'id="video"',"id='theMainImage_obj'  name='theMainImage' " ,$content,$ncount);
+      $content=str_replace( 'id="video"',"id='theMainImage_vid'  name='theMainImage' " ,$content,$ncount);
+  $content=str_replace( '<video"',"<video id='theMainImage_vid'  name='theMainImage' " ,$content,$ncount);
   }else{
       $content=str_replace( "<iframe" ,  "<iframe id='iframe' name='theMainImage' "  ,$content,$ncount);
@@ -261 +233 @@
   $content=  preg_replace($pattern, "", $content);
 
-  $content= "<div id='theMainImage' style='height:".$theImageHeight."px  ;width:".$theImageWidth."px '>". $content . "<img src='".AUTOSIZE_PATH . "images/transparent.gif' /></div>";
+  $content= "<div id='theMainImage' style='height:".$theImageHeight."px  ;width:".$theImageWidth."px '>". $content . "</div>";
  $content= "<style>#theImageAndInfos{height:auto;width:auto;position:relative}
-  #theImage{height:auto;align:center;text-align:center;width:100%;position:relative}
+  #theImage{height:auto;align:center;text-align:center;position:relative}
   #theMainImage{height:auto;align:center;text-align:center;position:static}  
   #charlie{display:none }
@@ -270 +242 @@
 return  $content;
  }
- $content=  preg_replace($pattern, "", $content);
+ 
+   $content=  preg_replace($pattern, "", $content);
 
   return  $content;
@@ -291 +264 @@
   if(preg_match("|event|", $DEBUG_autosize, $val)) { $infos_message .= "init2, ";} ;
    global $theImageHeight,$theImageWidth,$theImageLeft,$theImageTop,$windowWidth,$windowHeight,$theMainImageSize;
-
-
   //-- si Autosize correction redim ---------------
   $current = $template->get_template_vars('current'); 
   if (!isset($current)) return ;
-  
-//  if( $has_pamoorama=="true") return $content ;
-   if($pictureSelType!="Autosize") return $content ;
-
-$pattern =Array('/width=\"(\d+)\"/','/height=\"(\d+)\"/');
-$replacement = Array('',"style='height:".$theImageHeight."px'");
-$content= preg_replace($pattern, $replacement, $content);
+  if($pictureSelType!="Autosize") return $content ;  
+    $pattern =Array('/width=\"(\d+)\"/','/height=\"(\d+)\"/');
+    $replacement = Array('',"style='height:".$theImageHeight."px'");
+      $replacement = Array('',"");
+    $content= preg_replace($pattern, $replacement, $content);
 if( $has_pamoorama=="true") return $content ;
 
 if( !preg_match("|c1|", $DEBUG_autosize, $val) ) return $content ;
-
 //************************  c1 ***************************************
    echo "theMainImageWidth :" . $theMainImageSize[0] . " X " . $theMainImageSize[1]  . "<br >";
    echo "theImageWidth :" . $theImageWidth . " X " . $theImageHeight . "<br >";
-
    echo $infos_message."<br />";
-   
    $Ratio = $theMainImageSize[0]/$theMainImageSize[1];
 
@@ -331 +297 @@
          echo "left:".$theImageLeft."px;top:".$theImageTop."px;width:".$theImageWidth ."px;height:" .$theImageHeight."px;";
         echo "<div style='position:absolute;left:".$theImageLeft."px;top:".$theImageTop."px;width:".$theImageWidth ."px;height:" .  $theImageHeight."px;background-color:green;'>";
- 
- 
  die("#317 : " . $content + $DEBUG_autosize);
- $theImageHeight =abs($theImageHeight);
- $theImageWidth =abs($theImageWidth);
-
-    if ( preg_match("|<img|", $content, $val) ){
-        $chars=substr($pictureDeriv,0,2);    
-        $content=str_replace("<img ","<!--img ",$content);
-        $content=str_replace(">","-->",$content);
-        $src=explode( 'src=',$content);
-        $src=explode( ' ',$src[1]);
-        $src=$src[0];   
-        $char2=substr($src,-7); 
-        $content=str_replace("$char2", $chars.'.JPG"',$content);    
-        $ncount=1;
-        $content=str_replace( "width" ,  "old_w"  ,$content,$ncount);
-        $content=str_replace( "height" , "old_h" ,$content,$ncount);
-        if (isset($theImageHeight) && isset($theImagewidth))
-        $content=str_replace(" old_w","style='height:".$theImageHeight."px; width:".$theImageWidth."px;' old_w",$content,$ncount);
-        $content=str_replace("<!--img ","<img ",$content);
-        $content=str_replace("-->",">",$content);   
-       
-       $content=$content. "<span><br> height:".$theImageHeight."px; width:".$theImageWidth."px; </span>" ;
-        return $content ;
-    } 
-     // id="charlie"
-     if ( preg_match("|charlie|", $content, $val) ){
-   
-
-     //    return $content ;
-
- }
-
- 
-
-     
     
 } //INIT2
@@ -374 +304 @@
 ***************************/
 static public  function reload(){
-    //=========================================
-    include_once ( "include/functions_cookie.inc.php");
+//=========================================
+include_once ( "include/functions_cookie.inc.php");   
+global $ma_page,$user,$element_info,$infos_message,$DEBUG_autosize;
+global $pictureDeriv,$pictureSelType,$pictureMap;
+      global $conf;
+
   $set_miniature = "<!DOCTYPE html><html><head>
    <meta http-equiv='content-type' content='text/html; charset=UTF-8'/>
@@ -384 +318 @@
 
    $set_var = "<script type='text/javascript'>\n var COOKIE_PATH =  '".cookie_path()."';\n";  
-   global $ma_page,$user,$element_info;
+
    $set_var .= " var mapage =  '". $ma_page . "';\n";  
    $set_var .= " var theme =  '" .$user['theme']. "';\n";  
@@ -399 +333 @@
      <div></div>
       </body></html>";   
+
+ 
+  $default_size =  $conf['derivative_default_size'];
+//=======================================================================
+$pictureSelType = pwg_get_session_var('picture_sel_type',$default_size);  
+$pictureDeriv = pwg_get_session_var('picture_deriv',$default_size);  
+$pictureMap = pwg_get_session_var('picture_map',$default_size);  
+//=======================================================================
+   $autosize_parametres = cl_autosize_Get_Options();
+   $userst= $user['status']."_enabled" ;
+ $userst=$autosize_parametres-> $userst;
+ $usertype= $user['status']."_type" ;
+ $usertype = $autosize_parametres->$usertype;
+if($userst=='off'){
+ 
+}else{ 
+      if($usertype!="Autosize" && $usertype!="SelMaxi" ){
+          $pictureSelType = $usertype;
+          $pictureDeriv = $usertype;
+      }else if($autosize_parametres->defaut_type=="off"){
+          $pictureSelType = pwg_get_session_var('picture_sel_type',"SelMaxi"); 
+      }else {
+          $pictureSelType = pwg_get_session_var('picture_sel_type',"Autosize");  
+      }
+}        
+//============================================================
+  self::save_cookies();
+if( !isset($_COOKIE['picture_deriv'])  ){
+  echo "INIT <pre>";
+  print_r($_COOKIE);
+  die(400);
+}
+
+if(preg_match("|vue_init|", $DEBUG_autosize, $val)) { 
+        echo "Reload: $userst <br> $usertype <br> autosize_parametres:"  . cl_print_var($autosize_parametres) ;
+        echo $infos_message ;
+    if ( isset($_COOKIE['pwg_id']) ) unset ($_COOKIE['pwg_id']) ;
+        echo "Reload: SESSION:"  . cl_print_var($_SESSION) ;
+        echo "Reload: COOKIE:"  . cl_print_var($_COOKIE) ;
+        echo "GET:"  . cl_print_var($_GET) ;
+        echo "POST:"  . cl_print_var($_POST) ;
+        die("#442: ".$DEBUG_autosize);
+ }
         echo $set_miniature ;
         echo $set_var ;
         echo $autoscript;  
-                 die();
+        die();
       //=========================================     
 
@@ -422 +399 @@
  //==== mise à l'échelle ===
     $current = $template->get_template_vars('current'); 
-      $default_size =  $conf['derivative_default_size'];
+    $default_size =  $conf['derivative_default_size'];
 
     if(isset($current['selected_derivative'])) {
@@ -443 +420 @@
     $autosize_parametres =       cl_autosize_Get_Options() ;                    
     $theme=$user['theme'];
-
     //==============================================================================
- 
     $template->assign(
       array(   
@@ -458 +433 @@
           'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS,
           'Version_pwg' => PHPWG_VERSION ,
-          'slideshow' => $page['slideshow']
+          'slide_show' => $page['slideshow']
          )
     );
@@ -488 +463 @@
     $theme=$user['theme'];
     if ($has_pamoorama=="false" ) return ; 
-    if ($css_slideshow="no" and isset($_GET['slideshow'])) return ;   
+    if ($css_slideshow == "no" and isset($_GET['slideshow'])) return ;   
                         $AUTOSIZE_PATH = dirname(__FILE__).'/';
-
 //=====================================================================
-
-
                         $template->assign(
                                         array(
@@ -501 +473 @@
                                         'theme' => $theme  ,
                                         'DEBUG_autosize' => $DEBUG_autosize   ,
-                                        'AUTOSIZE_PATH' => AUTOSIZE_PATH
-         
+                                        'AUTOSIZE_PATH' => AUTOSIZE_PATH         
                                         )
                                                 );
-
                         $autoscript="<script type='text/javascript'>
                         /* cl_autosize_script_2 */
@@ -558 +528 @@
 *************************/      
         static public function cl_autosize_affiche(){
-
-
   if (!defined('AUTOSIZE_PATH')) {
       define(  'AUTOSIZE_PATH',   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' );
@@ -565 +533 @@
         define(  'AUTOSIZE_PATH_ABS',  realpath(AUTOSIZE_PATH)."/");
 }
-
 
     global $user, $picture, $template,$page,$known_script;
@@ -575 +542 @@
     global $autosize_parametres,$user_status;    
     global  $has_pamoorama,$pictureSelType,$pictureDeriv;
-     global $DEBUG_autosize;
+    global $DEBUG_autosize;
+      global $css_slideshow,$css_display;  
       if(preg_match("|event|", $DEBUG_autosize, $val)) { $infos_message .=  "cl_autosize_affiche, " ;} ;
-
 $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
 if ($ma_page !='thePicturePage') return ;  
+//============================================================
+ self::save_cookies();
+
     if(isset($set_miniature)){
-
           $set_miniature = self::cl_autosize_nofile($set_miniature) ;
           $set_miniatures= explode("script",$set_miniature);
@@ -594 +563 @@
           $template->append('footer_elements',$set_miniature);  
       }
-         
-  global $css_slideshow,$css_display;
-                $AUTOSIZE_PATH = dirname(__FILE__).'/';
-   $theme=$user['theme'];  
-                load_language('plugin.lang', AUTOSIZE_PATH);
-                include_once (AUTOSIZE_PATH."include/affiche.php");      
-   
+ if ($css_slideshow == "no" and isset($_GET['slideshow'])) return ;   
+  
+  $AUTOSIZE_PATH = dirname(__FILE__).'/';
+  $theme=$user['theme'];  
+  load_language('plugin.lang', AUTOSIZE_PATH);
+
+ include_once (AUTOSIZE_PATH."include/affiche.php");   
 
      $file =AUTOSIZE_PATH_ABS.'template/picture_1.tpl' ;
@@ -613 +582 @@
      if($pictureSelType == $pictureDeriv ) {
          if(preg_match("|event|", $DEBUG_autosize, $val)) {  cl_aff_infos_plus();} ;
-     //   return ;
+    
      } 
-         if (defined('GMAPS_VERSION')) $gmaps_function="true";
+      
+    if (defined('GMAPS_VERSION')) $gmaps_function="true";
           else $gmaps_function="false" ;
+
+
 
         $template->set_filenames(array('autosize_content_header'=> $file )); 
@@ -669 +641 @@
         $template->parse('mes_script');
       }    
-      
-        cl_aff_infos_plus();
+     
+
+if(preg_match("|vue_cookies|", $DEBUG_autosize, $val)) { 
+
+  $pictureSelType=$_COOKIE['picture_sel_type'];
+  $pictureDeriv=$_COOKIE['picture_deriv'];
+  $infos_message .= "cl_autosize_affiche: $pictureSelType  <--> $pictureDeriv \n" ;
+
+}
+   cl_aff_infos_plus();
+   if(preg_match("|test|", $DEBUG_autosize, $val)) { 
+    echo "cl_autosize_affiche:_COOKIE:"  . cl_print_var($_COOKIE) ;
+    echo $infos_message ;
+    $pictureMap=$_COOKIE['picture_map'];
+    echo "SelType:" . $pictureSelType." pictureDeriv:".$pictureDeriv ." pictureMap:".$pictureMap;
+    die ("#710: ".$DEBUG_autosize);
+ }
         return $template->parse( 'autosize_content', false);
-   
-        
-
         } //public function cl_autosize_affiche
 
@@ -1042 +1026 @@
     $img_url  = $img_select->get_url();
     if(!file_exists(PHPWG_ROOT_PATH.$img_url)){   
-      $img_type  =  $img_select->get_type();      
+      $img_type  =  $img_select->get_type();     
+     
       $file_id=explode("?",$img_url); 
       if(count($file_id) ==1){
@@ -1053 +1038 @@
               $file_no->id=$id ;
               $file_no->type=$img_type ; 
-              array_push($nofiles,serialize($file_no)) ;              
+              array_push($nofiles,serialize($file_no)) ;   
+               if( $img_type == $pictureDeriv){
+         
+          break ;
+    }           
       }
       $ok=false ;     
@@ -1066 +1055 @@
       $nosrc=true ;
     }  
-   
-     
-   $exec_miniatures ="";
+    $exec_miniatures ="";
       $script_miniatures .= "<script type='text/javascript'>
         var nofile=Array(";
@@ -1092 +1079 @@
     }
  }
+ /***************************
+ *  get_cookies
+ ****************************/
+ static public  function  get_cookies(){
+  global $pictureDeriv,$pictureSelType,$pictureDeriv;
+  if(!isset($_COOKIE['picture_deriv'])){
+      $pictureDeriv= pwg_get_session_var('picture_deriv');
+      $pictureSelType = pwg_get_session_var('picture_sel_type');
+      $pictureMap = pwg_get_session_var('picture_map') | $pictureDeriv;
+  }else{
+      $pictureDeriv = $_COOKIE['picture_deriv'];
+      $pictureSelType = isset( $_COOKIE['picture_sel_type'])?$_COOKIE['picture_sel_type']:$pictureDeriv;
+      
+      $pictureMap =  isset($_COOKIE['picture_map'])?$_COOKIE['picture_map']:$pictureDeriv;
+  }
+  $_COOKIE['picture_sel_type']=$pictureSelType;
+  $_COOKIE['picture_deriv']=$pictureDeriv;
+  $_COOKIE['picture_map']=$pictureMap;
+
+ }
+ /***************************
+ * save_cookies
+ ****************************/
+ static public  function  save_cookies(){
+ global $pictureDeriv,$pictureSelType,$pictureDeriv;
+
+  pwg_set_session_var('picture_deriv',$pictureDeriv);
+  pwg_set_session_var('picture_sel_type',$pictureSelType);
+  pwg_set_session_var('picture_map',$pictureDeriv);
+//============================================================
+  setcookie( 'picture_sel_type',
+            $pictureSelType,
+            time()+5,
+            cookie_path() 
+          );
+//=============================================================
+  setcookie( 'picture_map',
+            $pictureDeriv,
+            time()+5,
+            cookie_path() 
+          );
+//============================================================
+  setcookie( 'picture_deriv',
+            $pictureDeriv,
+            time()+5,
+            cookie_path() 
+          );
+$_COOKIE['picture_sel_type']=$pictureSelType;
+$_COOKIE['picture_deriv']=$pictureDeriv;
+$_COOKIE['picture_map']=$pictureDeriv;
+}
  //==================================================
 } // class

extensions/Autosize/css/kardon.css

@@ -1 @@
-
-
-  #theImage {
-  border: 1px solid Transparent;
-  
+#theImage {
+ margin-top :2px;
+  border: 0px solid red;
+ 
 }
 .contentWithMenu {
@@ -13 +12 @@
   text-align: center;
 }
+#content{ border: 1px solid Transparent;
+
+}

extensions/Autosize/include/affiche.php

@@ -58 +58 @@
 $COOKIE_PATH= cookie_path() ;
  global $DEBUG_autosize;
-     
+
+ $slide_show = isset($page['slideshow'])?$page['slideshow']:false;
+
         $template->assign(
                                         array(  
@@ -69 +71 @@
             'liste_type' => $liste_type ,
             'COOKIE_PATH' =>  $COOKIE_PATH  ,
+            'slide_show' => $slide_show,
              
             'ratio' =>$imgSizeWH[0]/$imgSizeWH[1] ,   

extensions/Autosize/js/Affiche_script.js

@@ -6 +6 @@
   *  document ready
   ********************************************/
-
-
   jQuery(document).ready(function (jQuery) {
     var Type_Img;
@@ -32 +30 @@
       parametres.windowWidth = jQuery(window).width();
       try {
+        if (parametres.pictureDeriv) jQuery.cookie('picture_deriv', parametres.pictureDeriv, { path: COOKIE_PATH });
         if (parametres.pictureSelType) jQuery.cookie('picture_sel_type', parametres.pictureSelType, { path: COOKIE_PATH });
-        if (parametres.pictureDeriv) jQuery.cookie('picture_deriv', parametres.pictureDeriv, { path: COOKIE_PATH });
         if (parametres.pictureMap) jQuery.cookie('picture_map', parametres.pictureMap, { path: COOKIE_PATH });
         if (parametres.imgSrc) jQuery.cookie('img_src', parametres.imgSrc, { path: COOKIE_PATH });
@@ -51 +49 @@
         }
       } catch (e) {
-
+        n = 1;
       }
 
@@ -64 +62 @@
         pictureDeriv: jQuery.cookie('picture_deriv'),
         pictureMap: jQuery.cookie('picture_map'),
+        pictureSelType: jQuery.cookie('picture_sel_type'),
+
         imgSrc: jQuery.cookie('img_src'),
-        pictureSelType: jQuery.cookie('picture_sel_type'),
         theMainImageHeight: jQuery.cookie('theMainImageHeight'),
         theMainImageWidth: jQuery.cookie('theMainImageWidth'),
-
 
         windowHeight: jQuery.cookie('windowHeight'),
@@ -228 +226 @@
 
         }
+        jQuery("#derivativeSwitchBox span").removeClass("auto_details linkAutosize");
+        jQuery("#derivativeSwitchBox a").removeClass("auto_details linkAutosize");
+        if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
+          spans = jQuery("#derivativeChecked" + options.pictureSelType).next();
+          spans.addClass("linkAutosize");
+          spans.find("span").addClass("auto_details");
+          jQuery(".auto_details").text("");
+        }
         if (options.pictureDeriv) {
+          if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi")
+            jQuery("#derivativeChecked" + options.pictureSelType).css("visibility", "visible");
+          else
+            jQuery("#derivativeChecked" + options.pictureDeriv).css("visibility", "visible");
           jQuery('.auto_details').text(" (" + Zone_image.image.width + " x " + Zone_image.image.height + ") " + options.pictureDeriv);
         }
@@ -247 +257 @@
       }
       Affiche_limite(pictureSelType_user);
-      jQuery("#derivativeChecked" + options.pictureDeriv).css({ visibility: 'visible'      });
-
     }
     //____________________ set_cl _____________________________
@@ -306 +314 @@
     ********************************************/
     jQuery(window).load(function () {
-      href = location.href;
+      location_href = location.href;
       var aff_ok = false;
       //=======================================================================
@@ -312 +320 @@
       infos_theMainImage = jQuery(theMainImage_id).infos({ absolute: true });
       infos_theImageAndInfos = jQuery(theImageAndInfos_id).infos();  // Cadre general
-      theMainImage_obj = "theMainImage_obj";
-      infos_theMainImage_obj = jQuery("#" + theMainImage_obj).infos({ absolute: true });
+      the_mainImage_obj = "theMainImage_obj";
+      infos_theMainImage_obj = jQuery("#" + the_mainImage_obj).infos({ absolute: true });
 
       infos_theMainImage_obj.rapport = infos_theMainImage_obj.width / infos_theMainImage_obj.height;
@@ -484 +492 @@
     }
     options = jQuery.extend(Autosize_options, options);
-    var COOKIE_PATH = options.COOKIE_PATH;
-    var cookies = Get_cookies();
+
 
     var defaults = {
@@ -505 +512 @@
     options.marge_gauche = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("left"));
     options.marge_droite = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("right"));
+
     jQuery(".Autosize").hide();
+    DEBUG_autosize = options.DEBUG_autosize;
+    var COOKIE_PATH = options.COOKIE_PATH;
+    var cookies = Get_cookies();
 
     fade_in = options.fade_in || 0;
@@ -516 +527 @@
     }
 
-    DEBUG_autosize = options.DEBUG_autosize;
+
     Get_type_img();
 
@@ -571 +582 @@
       path_names = new Array();
       jQuery("#derivativeSwitchBox a").css('visibility', 'hidden');
-      jQuery(".switchCheck").css('visibility', 'hidden');
+      // jQuery(".switchCheck").css('visibility', 'hidden');
       var maxi_display = false;
       jQuery("#derivativeSwitchBox a").each(function (i) {
         href_path = jQuery(this).attr("href");
+        if (!href_path) {
+          href_path = jQuery(this).html();
+          return;
+        }
+        pt = href_path.replace(/(javascript|changeImgSrc)|[('):]/gi, "");
+
         patname = href_path.replace("javascript\:", "");
-        path_names.push(patname);
-        pt[i] = href_path.split("','");
-        tsz = pt[i][2].replace("')", "");
+        pt = pt.split(",");
+        tsz = pt[pt.length - 1];
         if (!maxi_display)
           jQuery(this).css('visibility', 'visible');
@@ -595 +611 @@
           if (tsz == "Original" && (pictureSelType_Maxi != "Autosize" && pictureSelType_Maxi != "SelMaxi")) {
             maxi_display = true;
-          }
-          if (tsz == pictureSelType_Maxi && (pictureSelType_Maxi != "Autosize" && pictureSelType_Maxi != "SelMaxi")) {
+          } else if (tsz == pictureSelType_Maxi && (pictureSelType_Maxi != "Autosize" && pictureSelType_Maxi != "SelMaxi")) {
             maxi_display = true;
 
-          }
+          } else if (tsz == "Autosize" || tsz == "SelMaxi") {
+            patname = old_path.replace("')", "','" + tsz + "')");
+          } else
+            old_path = patname;
+          path_names.push(patname);
 
         }
@@ -759 +778 @@
       function decode_href(myObj) {
         hrefPath = jQuery(myObj).attr("href");
-        if (hrefPath.indexOf("changeImg") == 0) {
+        if (hrefPath.indexOf("changeImgSrc") < 0) {
           pt = hrefPath;
         } else {
-          pt = hrefPath.split("(");
-          pt = pt[1].split(")");
-          pt = pt[0].replace(RegExp("'", "g"), "");
-        }
-        pt = pt.replace(RegExp(" ", "g"), "");
+          pt = hrefPath.replace(/(javascript|phpWGOpenWindow|javascript|changeImgSrc)|[('):]/gi, "");
+
+        }
         pt = pt.split(",");
         source = pt[0];
-
-        pictureDeriv = pt[1];
-        pictureMap = pt[2];
-        if (pt.length > 3)
-          pictureSelType = pt[3];
-        else
-          pictureSelType = pt[1];
-
+        if (hrefPath.indexOf("phpWGOpenWindow") < 0) {
+          pictureDeriv = pt[1];
+          pictureMap = pt[2];
+          pictureSelType = pt[pt.length - 1];
+        } else {
+          pictureDeriv = options.pictureDeriv;
+          pictureMap = options.pictureMap;
+          pictureSelType = options.pictureSelType;
+        }
         return { source: source,
           pictureDeriv: pictureDeriv,
@@ -801 +819 @@
 
         }
-
-        jQuery("#derivativeSwitchBox span").removeClass("auto_details linkAutosize");
-        jQuery("#derivativeSwitchBox a").removeClass("auto_details linkAutosize");
-        if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
-          spans = jQuery("#derivativeChecked" + options.pictureSelType).next();
-          spans.addClass("linkAutosize");
-          spans.find("span").addClass("auto_details");
-          jQuery(".auto_details").text("");
-        }
         Autosize_resize(true, options);
       }
@@ -918 +927 @@
 
         if (Type_Img == "charlie" || Type_Img == "iframe") {
-
-
           if (Type_Img == "charlie") {
             dp1 = jQuery("#charlie").offset();
-            dp = jQuery("#" + theMainImage_obj).offset();
+            dp = jQuery("#" + the_mainImage_obj).offset();
             if (dp) {
               if (wpng == 0)
-                wpng = (dp.left - dp1.left) * 2;
+                wpng = Math.abs(dp.left - dp1.left) * 2;
             }
-            mrgl = (jQuery("#" + "theImage").width() - Zone_image.image.width) / 2;
             png_h = jQuery("#" + Type_Img + " div").height();
-            jQuery("#" + Type_Img).css({ marginLeft: mrgl + "px" });
-            jQuery("#" + Type_Img).width(Zone_image.image.width);
-            jQuery("#" + Type_Img).height(Zone_image.image.height);
-
-            w01 = jQuery("#" + theMainImage_obj).width();
-            jQuery("#" + theMainImage_obj).attr("width", Zone_image.image.width - wpng);
-            jQuery("#" + theMainImage_obj).attr("height", Zone_image.image.height);
-            jQuery("#theMainImage_emb").attr("width", Zone_image.image.width - wpng);
-            jQuery("#theMainImage_emb").attr("height", Zone_image.image.height);
+            w01 = Math.ceil(jQuery("#" + "theImage").width() - wpng);
+            jQuery("#" + "theImage").css({ padding: 0 });
+            if (!png_h) {
+              png_h = jQuery("#theMainImage").height();
+              h01 = png_h;
+            } else
+              h01 = Math.ceil(w01 / Zone_image.image.rapport);
+            //==== Zone Affichage =====
             jQuery("#theMainImage").height(png_h);
+            jQuery("#theMainImage").width(w01 + wpng);
+            jQuery("#theMainImage").css({ verticalAlign: "middle", align: "center", textAlign: "center", margin: "auto" });
+
+            jQuery("#" + the_mainImage_obj).attr("width", w01);
+            jQuery("#" + the_mainImage_obj).attr("height", h01);
+
+            jQuery("#theMainImage_emb").attr("width", w01); //firefox opera
+            jQuery("#theMainImage_emb").attr("height", h01);
+
+            if (jQuery("#theMainImage_vid").length > 0) {
+              jQuery("#theMainImage_vid").attr("width", w01);
+              jQuery("#theMainImage_vid").attr("height", h01);
+            }
+            if (jQuery("video").length > 0) {
+              jQuery("video").attr("width", w01);
+              jQuery("video").attr("height", h01);
+            }
             jQuery("#" + Type_Img).height(png_h);
 
 
+            jQuery("#" + Type_Img + " div").width(w01);
+
+
+
           } else {
-            jQuery("#" + theMainImage_obj).attr("width", Zone_image.image.width);
-            jQuery("#" + theMainImage_obj).attr("height", Zone_image.image.height);
-            jQuery("#" + Type_Img).attr("width", Zone_image.image.width);
-            jQuery("#" + Type_Img).attr("height", Zone_image.image.height);
+            jQuery("#theImage").css({ height: "auto" });
+            jQuery("#theMainImage").css({ width: "auto", height: "auto" });
+            jQuery("#" + Type_Img).attr("width", Zone_image.image.width - (infos_theMainImage.borderwidth.left + infos_theMainImage.borderwidth.right));
+            jQuery("#" + Type_Img).attr("height", Zone_image.image.height - (infos_theMainImage.borderwidth.top + infos_theMainImage.borderwidth.bottom));
           }
-
-
-
           jQuery("#" + Type_Img).show(options.fade_in);
         }
@@ -967 +990 @@
     ******************/
     changeImgSrc = function (url, typeSave, typeMap, type) {
-      if (url) {
-        if (url.match(RegExp("i.php", "gi"))) {
-          urls = url.split("?");
-          urls = urls[1].split("?");
-          //   Set_images(urls);
-
-        }
-      }
-      url2 = jQuery("#theMainImage").attr("src");
-      if (typeof type != "undefined")
+
+      if (COOKIE_PATH == type) {
+        type = options.pictureSelType;
+      }
+      if (typeof type != "undefined") {
         options.pictureSelType = type;
-      else {
-        options.pictureSelType = typeSave;
-        type = typeSave;
-
+      } else {
+        type = options.pictureSelType;
       }
       options.pictureDeriv = typeSave;
       typeMap = typeSave;
-
+      options.pictureMap = typeMap;
+      options.pictureDeriv = typeSave;
+      jQuery.cookie('picture_deriv', typeSave, { path: COOKIE_PATH });
+
+      url_old = jQuery("#theMainImage").attr("src");
+      if (url != url_old) {
+        jQuery("#theMainImage").attr("src", url);
+      }
       jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
       if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
         jQuery('#derivativeChecked' + type).css('visibility', 'visible');
-        document.cookie = 'picture_sel_type=' + type + ';path=' + COOKIE_PATH;
+        jQuery.cookie('picture_sel_type', type, { path: COOKIE_PATH });
       } else {
 
         jQuery('#derivativeChecked' + typeSave).css('visibility', 'visible');
-        document.cookie = 'picture_sel_type=' + typeSave + ';path=' + COOKIE_PATH;
-      }
-      options.pictureMap = typeMap;
-      options.pictureDeriv = typeSave;
-      document.cookie = 'picture_deriv=' + typeSave + ';path=' + COOKIE_PATH;
-      jQuery("#theMainImage").attr("src", url);
+        jQuery.cookie('picture_sel_type', typeSave, { path: COOKIE_PATH });
+      }
 
       // jQuery("#theMainImage," + theMainImage_id + ",.preload, .next1 , ")
@@ -1014 +1033 @@
           // le fichier n'est pas present 
           imgsrc = jQuery(this).attr("src");
-
           return false;
-
-          imgsrc = jQuery(this).attr("src").replace("./_data/i/", "", 1);
-          imgsrc = this.src.split("/_data/i")[1];
-          if (typeof imgsrc == "undefined") return false;
-          url = 'i.php?' + imgsrc + "&ajaxload=true";
-          jQuery(theMainImage_id).attr("src", url);
-          //  getDerivativeUrls(imgsrc);
         }
 
@@ -1066 +1077 @@
               if (data.src) { }
               if (options.pictureDeriv == "Original" && data.src.match(RegExp("\-.." + ".jpg", "gi"))) {
-                Autosize_resize(true, options);
+                //    Autosize_resize(true, options);
               } else if (data.src.match(RegExp(options.pictureDeriv.substr(0, 2) + ".jpg", "gi"))) {
-                Autosize_resize(true, options);
+                //    Autosize_resize(true, options);
               } else {
 
-              }
-              type = options.pictureSelType;
-              typeSave = options.pictureDeriv;
-              jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
-              if (typeof type != "undefined" && (type == "Autosize" || type == "SelMaxi")) {
-                jQuery('#derivativeChecked' + type).css('visibility', 'visible');
-              } else {
-                jQuery('#derivativeChecked' + typeSave).css('visibility', 'visible');
               }
 
@@ -1084 +1087 @@
       //_________ theMainImage  ___________
 
-
-      document.cookie = 'picture_deriv=' + typeSave + ';path=' + COOKIE_PATH;
     }
 
@@ -1165 +1166 @@
     }).mouseover(function (i) {
 
-    })
-
+    });
 
     Wait_pamoorama_time = function () {
       if (nopano == true) return true;
-
-
-
       if (jQuery("#pamoorama").length) {
         tempo = tempo + 1;
@@ -1448 +1445 @@
         identique = Zone_image.src.match(RegExp(imgSrc, "gi"));
         if (identique) return;
-        href = get_href(IMg.pictureDeriv);
-        href_path = "javascript:" + href;
-        jQuery(".linkAutosize").attr("href", href_path);
+        href_path = get_href(IMg.pictureDeriv);
+        jQuery(".linkAutosize").attr("href", "javascript:" + href_path);
         theImg = document.getElementById(theMainImage_id.replace("#", ""));
 
@@ -1459 +1455 @@
         } else {
           last_id = IMg.pictureDeriv;
-          eval(href);
-          //changeImgSrc(imgSrc, last_id, IMg.pictureMap, options.pictureSelType);
+          eval(href_path);
+          // changeImgSrc(imgSrc.replace("./",""), last_id, IMg.pictureMap, options.pictureSelType);
         }
 
@@ -1484 +1480 @@
 
     get_href = function (NewpictureDeriv) {
+      ref = path_names[0];
       for (i = 0; i < path_names.length; i++) {
         newHref = path_names[i];
@@ -1491 +1488 @@
           href = newHref;
           if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
-            href = href.replace("')", "','" + options.pictureSelType + "')");
+            ref = href.replace("')", "','" + options.pictureSelType + "')");
+          } else {
+            ref = href;
           }
           break;
@@ -1497 +1496 @@
 
       }
-      return href;
+
+
+      return ref;
     };
 
@@ -1628 +1629 @@
       // copyright 
 
+      if (options.slideshow) {
+
+
+      } else {
+
+      }
 
 
@@ -1651 +1658 @@
         infos_the_page.margin.left = 20;  //taille fleche
         infos_the_page.margin.right = 20;
-      }
-
-
-      if (test_theme("elegant")) {
+
+      } else if (test_theme("kardon")) {
+
+      } else if (test_theme("elegant")) {
 
         if (infos_imageInfos.visible == true) {
@@ -1669 +1676 @@
 
       } else if (test_theme("simple")) {
-
-
+        infos_menubar = jQuery("#menubar").infos({ absolute: true });
+        infos_imageInfoBar = jQuery("#imageInfoBar").infos({ absolute: true });
+
+        jQuery("#theImage").width(infos_imageInfoBar.left - infos_theImage.left - 2);
+        marge_left += 0;
+        marge_right += 0;
 
       } else if (test_theme("OS")) {
@@ -1705 +1716 @@
       if (!options.check_desc_v)
         options.marge_bottom_2 = 0;
+      else
+        options.marge_bottom = 0;
+
       marge_bottom = options.marge_bottom_2 + options.marge_bottom;
       //================== Limite Format Image =====================
@@ -1786 +1800 @@
 
       options.theImageBottom = new_win.height - new_dim.out.bottom;
-      options.marge_top = Math.ceil(new_img.top - new_dim.top);
+      if (options.slideshow) {
+
+        options.marge_top = 0;
+      } else {
+        options.marge_top = Math.ceil(new_img.top - new_dim.top);
+      }
 
       if (options.theImageBottom_2 < 0) {
@@ -1980 +1999 @@
       sav_p = options.pictureSelType;
       options.pictureSelType = "SelMaxi";
-      href = get_href(options.pictureDeriv);
-      href_path = "javascript:" + href;
-
+      href_path = get_href(options.pictureDeriv);
       spans = jQuery("#derivativeCheckedSelMaxi").next();
-      spans.attr("href", href_path);
+      spans.attr("href", "javascript:" + href_path);
       spans.attr("name", "SelMaxi");
       spans = spans.find("span");
@@ -1991 +2008 @@
       //==========================================================
       options.pictureSelType = "Autosize";
-      href = get_href(options.pictureDeriv);
-      href_path = "javascript:" + href;
-
+      href_path = get_href(options.pictureDeriv);
       spans = jQuery("#derivativeCheckedAutosize").next();
-      spans.attr("href", href_path);
+      spans.attr("href", "javascript:" + href_path);
       spans.attr("name", "Autosize");
       spans = spans.find("span");
@@ -2002 +2017 @@
       //==========================================================
       options.pictureSelType = sav_p;
-
+      jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
       if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") {
+        jQuery('#derivativeChecked' + options.pictureSelType).css('visibility', 'visible');
         spans = jQuery("#derivativeChecked" + options.pictureSelType).next();
         spans.addClass("linkAutosize");
         spans.find("span").addClass("auto_details");
+      } else {
+        jQuery('#derivativeChecked' + options.pictureDeriv).css('visibility', 'visible');
       }
       pictureDeriv = options.pictureDeriv;
       Autosize_resize(true, options);
       Autosize_resize(true, options);
-
+      jQuery("#" + Type_Img).show(options.fade_in);
     };
     //_______________________ init_gen _______________________
@@ -2219 +2237 @@
 
 
-  });                           // ready
+  });                                                                                       // ready
 
 

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 2.11.1
+Version: 3.0.1
 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/template/autosize.tpl

@@ -7 +7 @@
         COOKIE_PATH:'{$COOKIE_PATH}',
         has_pamoorama: '{$has_pamoorama}',
-        slideshow: '{$slideshow}',
+        slideshow: '{$slide_show}',
 
         pictureSelType:'{$pictureSelType}',