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

Timestamp:

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

Author:

cljosse

Message:

[Autosize][beta] fix bug cl_conflit/autosize

File:

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

extensions/Autosize/autosize.inc.php

@@ -43 +43 @@
                 if (isset( $page['body_id'])  ) {
                 if ( $page['body_id']=='thePicturePage'  ) {
-                        if ( isset($picture['current'])){
-                                
+                        if ( isset($picture['current'])){                               
                                 $autosize_parametres = cl_autosize_Get_Options();
                                 include (AUTOSIZE_PATH."include/affiche.php");  
@@ -139 +138 @@
                 $my_path = dirname(__FILE__).'/';
                 $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;
-
+                
                 $ThePicture = $template->get_template_vars('current');
                 $tpl_name =   $user['theme'] ;
@@ -162 +160 @@
  {
            global  $template,$user,$conf,$picture ,$page, $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' ;
+                        
                         $theme=$user['theme'];
                         $template->assign(
@@ -173 +171 @@
                                         'name' => $cl_plugin['name'] ,
                                         'ma_page' =>    $page['body_id'],
-                                        'cl_conflit' => $cl_conflit  ,
+                                        
                                         'theme' => $theme  ,
                                         'DEBUG' => $debug   ,
@@ -182 +180 @@
 $autoscript="<script type='text/javascript'>
 if (typeof (save_framework) == 'function')
-save_framework('".$page['body_id']."');
+   save_framework('".$page['body_id']."');
 </script>";
                          $template->append('footer_elements',$autoscript);  
@@ -199 +197 @@
                 $template->set_filenames(array('autosize_init'=>$my_path. "template/conflit.tpl" ) );   
                 $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
-                $cl_conflit =  isset($conf['cl_conflit']) ? $conf['cl_conflit'] : 'true' ;                      
+                
                 $theme=$user['theme'];
                          
@@ -206 +204 @@
                                                 'cl_version' => $cl_plugin['version'] ,
                                                 'name' => $cl_plugin['name'] ,
-                                                'cl_conflit' => $cl_conflit  ,
+                                                
                                                 'theme' => $theme  ,
                                                 'DEBUG' => $debug   ,
@@ -220 +218 @@
 */
 static public function cl_ajuste_data($content){
-           global  $template,$user,$conf,$picture ;
-         $my_path = realpath(AUTOSIZE_PATH .'/');
-         $userdata=$user;
-         $fields = array( 'maxwidth', 'maxheight' );
+        global  $template,$user,$conf,$picture ;
+        $my_path = realpath(AUTOSIZE_PATH .'/');
+        $userdata=$user;
+        $fields = array( 'maxwidth', 'maxheight' );
          
-         $ThePicture = $template->get_template_vars('current'); 
-                        $data = array();
-                        
-                         
-
+        $ThePicture = $template->get_template_vars('current'); 
+        $data = array();
  return $content;
 
-                        $data['maxwidth'] = '1200';
-$data['maxheight'] ='250';
-                        $data['user_id'] = $userdata['id'];
-           foreach ($fields as $field)
-      {
-        if (isset($_POST[$field]))
-        {
-          $data[$field] = $_POST[$field];
-        }
-      }
+        $data['maxwidth'] = '1200';
+        $data['maxheight'] ='250';
+        $data['user_id'] = $userdata['id'];
+        foreach ($fields as $field)
+        {
+                if (isset($_POST[$field]))
+                {
+                        $data[$field] = $_POST[$field];
+                }
+        }
         
         if($data['maxwidth'] != "" )
-{
-        $picture['current']['scaled_width']=$data['maxwidth'];
-                 $picture['current']['scaled_height']=$data['maxheight'];
-       mass_updates(USER_INFOS_TABLE,
-                   array('primary' => array('user_id'), 'update' => $fields),
-                   array($data));
-        
-}
-
- 
-                return $content;
-   /*
-                $template->assign(
-                                                array(
-                                                'AUTOSIZE_PATH' => $my_path,
-                                                                                        )
-                                                 );
- 
-                $template->parse( 'autosize_cl_init', false);
-                return $content;
-        */
-
-                                                                                 
+                {
+                $picture['current']['scaled_width']=$data['maxwidth'];
+                $picture['current']['scaled_height']=$data['maxheight'];
+                mass_updates(USER_INFOS_TABLE,
+                                array('primary' => array('user_id'), 'update' => $fields),
+                                array($data));  
+                }
+                 
+                return $content;                                                                                 
          }