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

Timestamp:

Sep 28, 2012, 11:13:50 AM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, add theme directive

File:

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

extensions/Autosize/autosize.inc.php

@@ -36 +36 @@
   // header ('X-UA-Compatible: n=7')  ;
  // header ('X-UA-Compatible: IE=Edge')  ; 
- global  $template,$version,$icon_path,$page,$picture,$conf;
-  
+global  $template,$version,$icon_path,$page,$picture,$conf;
+global $user,$Css,$css_slideshow,$css_display;
   $current = $template->get_template_vars('current');  
-  $has_pamoorama=isset($template->files['pamooramics_content']);
+//=======================================================
+  $theme=$user['theme'];  
+  $Css = autosize_controler::css($theme."-rules.css");
+  $css_slideshow=isset($Css['.Autosize']['slideshow'])?$Css['.Autosize']['slideshow']:"yes";
+ 
+  $css_display= isset($Css['.Autosize']['display'])?$Css['.Autosize']['display']:"block";   
+
 //====================================================================    
   $pictureDeriv = pwg_get_session_var('picture_deriv',$conf['derivative_default_size']); 
@@ -45 +51 @@
   $SRC_IMG=""; 
 //=====================================================================
+
 if(!isset($_COOKIE['picture_deriv']))
-    if(isset($current['derivatives']['Autosize']))
+    if(isset($current['derivatives']['Autosize'])){
         $_COOKIE['picture_deriv']="Autosize";
-
-if(isset( $_COOKIE['picture_deriv']))
+        }
+if(isset( $_COOKIE['picture_deriv'])) 
   $model=  $_COOKIE['picture_deriv'] ;
 else
   $model= $pictureDeriv ;
 
+
+ 
+ if (($css_display=="none" || $css_slideshow=="no") && ($model=="SelMaxi" || $model=="Autosize") ) {
+   $model=$default_size ;
+   $_COOKIE['picture_deriv'] =$model ;
+}
+
  if(!isset($current['derivatives'][$model]))
    $model=$default_size ;
-
+ 
 $selected_derivative =  $current['derivatives'][$model];
+     /*
+      'selected_derivative' => $selected_derivative,
+      'unique_derivatives' => $unique_derivatives,
+      */
 
 
@@ -78 +96 @@
     $template->assign('current[selected_derivative]', $selected_derivative , true);
     $current = $template->get_template_vars('current'); 
-  }
-
+  }  
 return $content;
+
 
 }//INIT
@@ -105 +123 @@
   $current = $template->get_template_vars('current'); 
   if (!isset($current)) return ;
+  
 //===============================================================
     $derivative = $current['src_image'] ;
@@ -168 +187 @@
 if (!isset($_COOKIE['theMainImageWidth']))  setcookie('theMainImageWidth',$window_width); 
 
-//
-
+//================= Liste =========================
     $last_defined=ImageStdParams::get_defined_type_map();  
     foreach ($img_all as $img_select){
@@ -214 +232 @@
                 }
       }
-//==============================================================    
-  //==== Réécriture selection ====
-  if( $img_type=="SelMaxi"){
-      $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;
-   
-  /*  $_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']);
-        }else{
-     //       pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
-        }
-  //  setcookie('picture_deriv', false, 0, cookie_path() );
-  }  
-
-  
+
 return false ;
 
@@ -258 +248 @@
     global  $has_pamoorama;
     global $autosize_parametres,$user_status;
-  
-
+    
     if(isset($page['body_id']) &&       $page['body_id'] == 'theAdminPage' ) return ;   
 
- if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ;
-     if ('stripped' == $user['theme'] ) return ;
-
-                load_language('plugin.lang', AUTOSIZE_PATH);
+  global $css_slideshow,$css_display;
                 $AUTOSIZE_PATH = dirname(__FILE__).'/';
+   $theme=$user['theme'];  
+
+                load_language('plugin.lang', AUTOSIZE_PATH);
                  if (isset( $page['body_id']) && $page['body_id']=='thePicturePage'  ) {
                         if ( isset($picture['current'])){       
                                 include (AUTOSIZE_PATH."include/affiche.php"); 
-
         $file =AUTOSIZE_PATH_ABS.'template/picture_1.tpl' ;
+         if ($css_display=="none"  &&  $has_pamoorama) {   
+            $css_display="block" ;
+         }
         $template->set_filenames(array('autosize_content_header'=> $file )); 
-        $template->assign(
-                                        array(  
-            'select_type' =>$select_type,
-            ));
-
-        $template->concat('autosize_content', $template->parse('autosize_content_header', true));  
-
+        $template->assign(      array( AUTOSIZE_PATH,$AUTOSIZE_PATH,
+                                  'css_display' => $css_display,
+                                  'select_type' =>$select_type,
+                                  'theme' =>$theme
+                          ));
+        $template->concat('autosize_content', $template->parse('autosize_content_header', true)); 
+     if ($css_display=="none" ) {       
+        return ;
+      }  
+    
         $file =AUTOSIZE_PATH_ABS.'template/header.tpl' ;
         $template->set_filenames(array('autosize_init_header'=> $file ));
@@ -308 +302 @@
         $template->set_filenames(array('mes_script' => realpath(AUTOSIZE_PATH).'/template/mes_scripts.tpl') );
         $template->func_combine_script(array('id'=>'my_script_2',
-        'path'=> AUTOSIZE_PATH.'/js/JScript.js',
-        'require' => 'jquery'),
+                                             'path'=> AUTOSIZE_PATH.'/js/JScript.js',
+                                             'require' => 'jquery'),
         $template->smarty);
         $template->assign(array( 
@@ -330 +324 @@
   
     $ma_page=isset($page['body_id'])?$page['body_id']:"" ;
-    if ($ma_page=='thePiwiShackControllerPage') return ;   
-    if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ;
-    global  $has_pamoorama;
-    $has_pamoorama=isset($template->files['pamooramics_content']);
-  if (!$has_pamoorama) return ; 
-      if ('stripped' == $user['theme'] ) return ;
-
+    if ($ma_page=='thePiwiShackControllerPage') return ;  
+    global  $has_pamoorama,$css_slideshow;  
+    $has_pamoorama = isset($template->files['pamooramics_content']);  
+ if (!$has_pamoorama) return ; 
+
+ if ($page['slideshow']){
+    $current = $template->get_template_vars('current'); 
+    $model=$current['selected_derivative']->type ;
+    $selected_derivative =  $current['derivatives'][$model];  
+    $template->append('current', array(
+                                'selected_derivative' => $selected_derivative
+                                    ), 
+                      true);
+
+ }
     $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );
     $autosize_parametres =       cl_autosize_Get_Options() ;                    
@@ -356 +358 @@
           'AUTOSIZE_PATH' => str_replace("../","",AUTOSIZE_PATH)  ,
           'AUTOSIZE_PATH_ABS' => AUTOSIZE_PATH_ABS,
-          'Version_pwg' => PHPWG_VERSION           )
+          'Version_pwg' => PHPWG_VERSION ,
+          'slideshow' => $page['slideshow']
+         )
     );
+    
     return $template->parse( 'autosize_init', false);
+
         }// function cl_autosize_script_1
 
@@ -367 +373 @@
  {
            global  $template,$user,$conf,$picture ,$page, $cl_plugin,$known_script ;
-                global  $template,$user,$conf,$picture ,$page, $cl_plugin ;
-            if(isset($page['body_id']) &&       $page['body_id'] == 'theAdminPage' ) return ;   
-    
-   if ('kardon' == $user['theme'] and isset($_GET['slideshow'])) return ;
-     global  $has_pamoorama;
-       if (!$has_pamoorama) return ; 
-       if ('stripped' == $user['theme'] ) return ;
-
+     global  $template,$user,$conf,$picture ,$page, $cl_plugin ;
+     if(isset($page['body_id']) &&      $page['body_id'] == 'theAdminPage' ) return ;   
+       global  $has_pamoorama;
+  if (!$has_pamoorama) return ; 
+  global $css_slideshow;
+ 
+ if ($css_slideshow="no" and isset($_GET['slideshow'])) return ;   
+  
+   
                         $AUTOSIZE_PATH = dirname(__FILE__).'/';
 //================================================================
@@ -590 +597 @@
     return $parametres ;
   }
+  /****************************************************/
+  
+function listeFichiers($dir,$theme){
+  global $extensions_allowed;
+  $extensions_allowed = array();
+  $extensions_allowed [] = 'css';
+  if ($handle = opendir($dir)) {   
+    while (false !== ($file = readdir($handle))) {
+      if (($file <>'.') && ($file<>'..')) {
+        if (is_file($dir.'/'.$file)){
+          $extension = pathinfo($dir.'/'.$file, PATHINFO_EXTENSION);
+          if (in_array($extension,$extensions_allowed)){
+            $fileHandle = fopen($dir.'/'.$file, "r");
+            
+            $intro = fread($fileHandle,filesize ($dir.'/'.$file));
+            fclose($fileHandle);
+            if ($file== $theme){       
+              flush();   
+              return $intro ;
+            }
+          }
+      } else {
+        if (is_dir($dir.'/'.$file)){
+          listeFichiers($dir.'/'.$file,$theme);
+        }
+      }
+    }
+   }
+   closedir($handle);
+  }
+}
+//================================================
+function css($theme_local) {    
+    $path = $_SERVER['DOCUMENT_ROOT'];
+    if (substr($path,-1)=='/'){
+              $path =  substr($path,0,-1);
+          }
+     if(isset($_GET['path'])) 
+              $path=$_GET['path'];
+          else
+              $path=PHPWG_ROOT_PATH."local/css/";
+
+              $mycssfile=$path.$theme_local;
+
+              if(!file_exists($mycssfile))
+               $mycssfile=$path."default-rules.css";
+
+      $ret =   file_get_contents ($mycssfile);
+
+function remove_comments( & $string ) { 
+   $string = preg_replace('#/\*.*?\*/#s',"",$string); 
+   return $string;
+ }
+
+$order   = array("\r\n", "\n", "\r"," ");
+$replace = '';
+$newstr = str_replace($order, $replace, $ret); 
+
+$order   = array('"');
+$replace = "'";
+$newstr = str_replace($order, $replace, $newstr); 
+
+
+$order   = array("}");
+$replace = '}\r\n';
+$newstr = str_replace($order, $replace, $newstr);
+remove_comments($newstr);
+
+$newstr = explode('\r\n',$newstr);
+$css=Array();
+    
+  foreach ($newstr as $key => $value) {    
+   if($value){
+    $css2=Array();
+      $key=explode("{",$value);    
+      $value = str_replace("}","",$key[1]) ;
+      $value=explode(";",$value); 
+           foreach ($value as $key2 => $value2) {    
+            if($value2){
+              $key2=explode(":",$value2);    
+                $value2 =  $key2[1] ;
+                $css2[$key2[0]] = $value2 ;
+            }
+           }
+      $css[$key[0]]=$css2 ;
+     }   
+}
+
+       
+                    return $css;
+        } 
+//=================================================
+
+
 } // class
 
@@ -718 +819 @@
   return $m;            
 }
-    
+
+
 
 ?>