Changeset 7944 for extensions/cl_conflit/conflit.inc.php

Timestamp:

Nov 30, 2010, 9:28:28 AM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] fix bug cl_conflit/autosize

File:

• extensions/cl_conflit/conflit.inc.php (modified) (5 diffs)

extensions/cl_conflit/conflit.inc.php

@@ -39 +39 @@
                 $template->set_filenames(array('cl_conflit_init'=>$my_path. "template/conflit.tpl" ) ); 
                 $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;                      
+$cl_conflit_parametres =         cl_conflit_Get_Options() ;
+
+                        
                 $theme=$user['theme'];
                 
                 $template->assign(
                                                 array( 
+                                                'cl_conflit_parametres' => $cl_conflit_parametres ,
+                                                'cl_plugins' => $cl_plugin ,
                                                 'cl_version' => $cl_plugin['version'] ,
                                                 'name' => $cl_plugin['name'] ,
-                                                'cl_conflit' => $cl_conflit  ,
+                                                 
                                                 'theme' => $theme  ,
                                                 'DEBUG' => $debug   ,
@@ -66 +70 @@
                         $my_path = dirname(__FILE__).'/';
                         $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                        $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;
+                         
                         $theme=$user['theme'];
 
@@ -74 +78 @@
                                                 'name' => $cl_plugin['name'] ,
                                                 'ma_page' =>    $page['body_id'],
-                                                'cl_conflit' => $cl_conflit  ,
+                                                 
                                                 'theme' => $theme  ,
                                                 'DEBUG' => $debug   ,
@@ -102 +106 @@
                         $my_path = dirname(__FILE__).'/';
                         $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                        $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;
+                         
                         $theme=$user['theme'];
 
@@ -153 +157 @@
   global $cl_conflit_parametres;
 //=============================================================================
-$cl_conflit_parametres->query =(isset($_POST['query'])) ? $_POST['query'] : ((isset($cl_conflit_parametres->query )) ? $cl_conflit_parametres->query : '' ) ;
-$cl_conflit_parametres->type=(isset($_POST['type']))? $_POST['type']: ((isset($cl_conflit_parametres->type)) ? $cl_conflit_parametres->type:  '') ;
+$cl_conflit_parametres->query =(isset($_POST['query'])) ? $_POST['query'] : ((isset($cl_conflit_parametres->query )) ? $cl_conflit_parametres->query : 'Qt' ) ;
+$cl_conflit_parametres->type=(isset($_POST['type']))? $_POST['type']: ((isset($cl_conflit_parametres->type)) ? $cl_conflit_parametres->type:  'Ty') ;