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

Timestamp:

Nov 28, 2010, 11:06:31 AM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] fix conflict with rv_gmaps

File:

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

extensions/Autosize/autosize.inc.php

@@ -134 +134 @@
  static public function cl_autosize_script_3($content)
  {
-           global  $template,$user,$conf,$picture ,$page;
+           global  $template,$user,$conf,$picture ,$page,$cl_version, $cl_plugin ;
            //userDefManage ??
                 $my_path =  basename(dirname(__FILE__)).'/' ;
             $my_path = dirname(__FILE__).'/';
-                        $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                        $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;
+                $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
+                $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;
 
 $ThePicture = $template->get_template_vars('current');
@@ -159 +159 @@
 
                 return $content ;
-//====================================================================
-                        $template->set_filenames(
-                     array('autosize_init'=>$my_path. "template/cl_conflit3.tpl"  
-                         )
-                      );                
-                         
-                        
-                          $theme=$user['theme'];
-                         
-                $template->assign(
-                                                array(
-                                                'cl_conflit' => $cl_conflit  ,
-                                                'theme' => $theme  ,
-                                                'DEBUG' => $debug   ,
-                                                'AUTOSIZE_PATH' => AUTOSIZE_PATH)
-                                                 );
-
-if(     $page['body_id'] == 'theAdminPage' ) return ;
-
-                   return $template->parse( 'autosize_init', false);
+
 
  }// function cl_autosize_script_3
@@ -184 +165 @@
  static public function cl_autosize_script_2()
  {
-           global  $template,$user,$conf,$picture ,$page;
+           global  $template,$user,$conf,$picture ,$page,$cl_version, $cl_plugin ;
            //userDefManage ??
                         $my_path =  basename(dirname(__FILE__)).'/' ;
@@ -192 +173 @@
                         $theme=$user['theme'];
                         $template->assign(
-                                        array('ma_page' =>      $page['body_id'],
+                                        array(
+                                        'cl_plugin' => $cl_version['id'] ,
+                                        'version' => $cl_version['version'] ,
+                                        'ma_page' =>    $page['body_id'],
                                         'cl_conflit' => $cl_conflit  ,
                                         'theme' => $theme  ,
@@ -198 +182 @@
                                         'AUTOSIZE_PATH' => AUTOSIZE_PATH)
                                                 );
-                                                 
+                                                 global $cl_plugin;
+ 
 $autoscript="<script type='text/javascript'>
 if (typeof (save_framework) == 'function')
@@ -205 +190 @@
                          $template->append('footer_elements',$autoscript);  
                          return ;
-
-
                         $template->set_filenames(
                      array('autosize_init'=>$my_path. "template/cl_conflit.tpl"  
                          )
                       );                
-                         
-                        
-                        
-                         
-
-
 if(     $page['body_id'] == 'theAdminPage' ) return ;
 
@@ -228 +205 @@
  static public function cl_autosize_script()
         {
-           global  $template,$user,$conf,$picture ,$page,$cl_version;
+           global  $template,$user,$conf,$picture ,$page,$cl_version, $cl_plugin ;
                 $my_path =  basename(dirname(__FILE__)).'/' ;
             $my_path = dirname(__FILE__).'/';
@@ -237 +214 @@
                          
                 $template->assign(
-                                                array( 'version' => $cl_version['version'] ,
+                                                array( 
+                                                'cl_plugin' => $cl_version['id'] ,
+                                                'version' => $cl_version['version'] ,
                                                 'cl_conflit' => $cl_conflit  ,
                                                 'theme' => $theme  ,
@@ -253 +232 @@
 static public function cl_ajuste_data($content){
            global  $template,$user,$conf,$picture ;
-                        $my_path = realpath(AUTOSIZE_PATH .'/');
+         $my_path = realpath(AUTOSIZE_PATH .'/');
          $userdata=$user;
          $fields = array( 'maxwidth', 'maxheight' );