Changeset 29005 for extensions/LLGBO2/maintain.class.php

Timestamp:

Jul 8, 2014, 1:55:14 PM (10 years ago)

Author:

gbo

Message:

Only 1 setting in database

File:

• extensions/LLGBO2/maintain.class.php (modified) (8 diffs)

extensions/LLGBO2/maintain.class.php

@@ -29 +29 @@
 class Look_like_gbo2_maintain extends PluginMaintain
 { 
-        private $default_Main;
+        private $default_main;
         private $default_tooltip;
         private $default_frame;
@@ -40 +40 @@
 include(PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/' .'defaultvalues.php');
      // variable declared in include       
-         $this->default_Main = $default_Main;
+         $this->default_main = $default_main;
          $this->default_tooltip = $default_tooltip; 
          $this->default_frame = $default_frame; 
@@ -55 +55 @@
                 global $conf; 
 // +-----------------------------------------------------------------------+    
-                if (empty($conf['LLGBO2settings']))
+                if (empty($conf['LLGBO2_Settings']))
                         {       if  (isset($conf['LLGBO'])) // compatibility 2.6 --> 2.7
                                         { $Oldvalues = explode("," , $conf['LLGBO']);                   
@@ -62 +62 @@
                                                                 {$Oldvalues[$cle]  = (boolean)true ;}   else { $Oldvalues[$cle]  = (boolean)false;}
                                                 }
-                                                $this->default_Main['version']                          =  1;
-                                                $this->default_Main['frame']                            =  $Oldvalues[0];
-                                                $this->default_Main['tooltipdisp']                      =  $Oldvalues[1];
-                                                $this->default_Main['exifunderbt']                      =  $Oldvalues[2];
-                                                $this->default_Main['titleframe']                       =  $Oldvalues[5];
-                                                $this->default_Main['manageheader']             =  $Oldvalues[6];
-                                                $this->default_Main['alwaysdisplayexif']        =  $Oldvalues[10];
+                                                $this->default_main['version']                          =  1;
+                                                $this->default_main['frame']                            =  $Oldvalues[0];
+                                                $this->default_main['tooltipdisp']                      =  $Oldvalues[1];
+                                                $this->default_main['exifunderbt']                      =  $Oldvalues[2];
+                                                $this->default_main['titleframe']                       =  $Oldvalues[5];
+                                                $this->default_main['manageheader']             =  $Oldvalues[6];
+                                                $this->default_main['alwaysdisplayexif']        =  $Oldvalues[10];
                                                 conf_delete_param('LLGBO');  // old values before 2.7
                                         }
-                                conf_update_param('LLGBO2settings',serialize($this->default_Main), true);
-                        }        
+                        
+                
 // +-----------------------------------------------------------------------+                            
-                if (empty($conf['LLGBO2tooltip'])) 
-                        {       if  (isset($conf['LLGBOTOOLTIP'])) // compatibility 2.6 --> 2.7
+                        if  (isset($conf['LLGBOTOOLTIP'])) // compatibility 2.6 --> 2.7
                                         {        $Oldvalues = explode("," , $conf['LLGBOTOOLTIP']);
 
@@ -85 +84 @@
                                                 $this->default_tooltip['TT-textcolor']          = $Oldvalues[5];
                                                         
-                                                        conf_delete_param('LLGBOTOOLTIP');  // old values before 2.7
+                                                conf_delete_param('LLGBOTOOLTIP');  // old values before 2.7
                                         }
-                                conf_update_param('LLGBO2tooltip',serialize($this->default_tooltip), true);
-                        }
+                        
 // +-----------------------------------------------------------------------+                            
-                if (empty($conf['LLGBO2frame']))        
-                        { if (isset($conf['LLGBOFRAME']))  // compatibility 2.6 --> 2.7
+        
+                        if (isset($conf['LLGBOFRAME']))  // compatibility 2.6 --> 2.7
                                 {        $Oldvalues = explode("," , $conf['LLGBOFRAME']);
                                      $i=0;
@@ -106 +104 @@
                                         conf_delete_param('LLGBOFRAME');  // old values before 2.7
                                 } 
-                                conf_update_param('LLGBO2frame', serialize($this->default_frame), true);
-                        }
+                
 // +-----------------------------------------------------------------------+                                    
-                if (empty($conf['LLGBO2header']))       
-                        { if (isset($conf['LLGBOHEADER']))  // compatibility 2.6 --> 2.7
+        
+                         if (isset($conf['LLGBOHEADER']))  // compatibility 2.6 --> 2.7
                                 {       $Oldvalues = explode("," , $conf['LLGBOHEADER']);
                                         $i = 0;
@@ -119 +116 @@
                                         conf_delete_param('LLGBOHEADER');  // old values before 2.7
                                 } 
-                                conf_update_param('LLGBO2header',serialize($this->default_header), true);       
-                        }
-
+                
+         $conf['LLGBO2'] =array_merge((array)$this->default_main, (array)$this->default_tooltip,(array) $this->default_frame,(array) $this->default_header);
+                 print_r($this->default_main);
+                 conf_update_param('LLGBO2_Settings', $conf['LLGBO2']); 
+                }
         }
 
@@ -134 +133 @@
 // +-----------------------------------------------------------------------+
         function uninstall() {  
-                conf_delete_param('LLGBO2settings');
-                conf_delete_param('LLGBO2tooltip');
-                conf_delete_param('LLGBO2frame');
-                conf_delete_param('LLGBO2header'); 
+                conf_delete_param('LLGBO2_Settings');
+        
         }
 }