Changeset 30460

Timestamp:

Nov 12, 2014, 2:34:53 PM (9 years ago)

Author:

plg

Message:

bug 3174 fixed: avoid using load_conf_from_db, use 3rd parameter updateGlobal instead

Location:

trunk/themes

Files:

• elegant/admin/admin.inc.php (modified) (2 diffs)
• elegant/admin/upgrade.inc.php (modified) (1 diff)
• smartpocket/admin/admin.inc.php (modified) (2 diffs)
• smartpocket/admin/maintain.inc.php (modified) (2 diffs)
• smartpocket/admin/upgrade.inc.php (modified) (1 diff)
• smartpocket/themeconf.inc.php (modified) (1 diff)

trunk/themes/elegant/admin/admin.inc.php

@@ -15 +15 @@
   $config_send['p_pict_comment']=(isset($_POST['p_pict_comment']) and !empty($_POST['p_pict_comment'])) ? $_POST['p_pict_comment'] : 'off';
   
-  $conf['elegant'] = serialize($config_send);
-  conf_update_param('elegant', pwg_db_real_escape_string($conf['elegant']));
+  conf_update_param('elegant', $config_send, true);
 
   array_push($page['infos'], l10n('Information data registered in database'));
@@ -24 +23 @@
     'theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
 
-$template->assign('options', unserialize($conf['elegant']));
+$template->assign('options', safe_unserialize($conf['elegant']));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content');

trunk/themes/elegant/admin/upgrade.inc.php

@@ -8 +8 @@
 {
   $config = array(
-    'p_main_menu'            => 'on',//on - off - disabled
-    'p_pict_descr'            => 'on',//on - off - disabled
-    'p_pict_comment'            => 'off',//on - off - disabled
+    'p_main_menu' => 'on', //on - off - disabled
+    'p_pict_descr' => 'on', //on - off - disabled
+    'p_pict_comment' => 'off', //on - off - disabled
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('elegant' , '".pwg_db_real_escape_string(serialize($config))."' , 'p_main_menu#');";
-  pwg_query($query);
-  load_conf_from_db();
+  
+  conf_update_param('elegant', $config, true);
 }
-elseif (count(unserialize( $conf['elegant'] ))!=3)
+elseif (count(safe_unserialize( $conf['elegant'] ))!=3)
 {
-  $conff=unserialize($conf['elegant']);
+  $conff = safe_unserialize($conf['elegant']);
   $config = array(
-    'p_main_menu'            => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
-    'p_pict_descr'            => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
-    'p_pict_comment'            => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
+    'p_main_menu' => (isset($conff['p_main_menu'])) ? $conff['p_main_menu'] :'on',
+    'p_pict_descr' => (isset($conff['p_pict_descr'])) ? $conff['p_pict_descr'] :'on',
+    'p_pict_comment' => (isset($conff['p_pict_comment'])) ? $conff['p_pict_comment'] :'off',
   );
-  conf_update_param('elegant', pwg_db_real_escape_string(serialize($config)));
-  load_conf_from_db();
+  
+  conf_update_param('elegant', $config, true);
 }
 ?>

trunk/themes/smartpocket/admin/admin.inc.php

@@ -14 +14 @@
   $config_send['autohide'] = (isset($_POST['autohide']) ? 5000 : 0);
   
-  $conf['smartpocket'] = serialize($config_send);
-  conf_update_param('smartpocket', pwg_db_real_escape_string($conf['smartpocket']));
+  conf_update_param('smartpocket', $config_send, true);
 
   array_push($page['infos'], l10n('Information data registered in database'));
@@ -23 +22 @@
     'theme_admin_content' => dirname(__FILE__) . '/admin.tpl'));
 
-$template->assign('options', unserialize($conf['smartpocket']));
+$template->assign('options', safe_unserialize($conf['smartpocket']));
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content');

trunk/themes/smartpocket/admin/maintain.inc.php

@@ -15 +15 @@
     if (empty($conf['smartpocket']))
     {
-      $conf['smartpocket'] = serialize($this->default_conf);
-      $query = "
-  INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-  VALUES ('smartpocket' , '".pwg_db_real_escape_string($conf['smartpocket'])."' , 'loop#autohide');";
-      pwg_query($query);
+      conf_update_param('smartpocket', $this->default_conf, true);
     }
-    elseif (count(unserialize( $conf['smartpocket'] ))!=2)
+    elseif (count(safe_unserialize($conf['smartpocket'])) != 2)
     {
-      $conff=unserialize($conf['smartpocket']);
+      $conff = safe_unserialize($conf['smartpocket']);
+      
       $config = array(
-        'loop'            => (!empty($conff['loop'])) ? $conff['loop'] :true,
-        'autohide'            => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
+        'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true,
+        'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
       );
-      conf_update_param('smartpocket', pwg_db_real_escape_string(serialize($config)));
-      load_conf_from_db();
+      
+      conf_update_param('smartpocket', $config, true);
     }
     $this->installed = true;
@@ -35 +32 @@
 
   function deactivate()
-  { }
+  {
+  }
 
   function delete()

trunk/themes/smartpocket/admin/upgrade.inc.php

@@ -8 +8 @@
 {
   $config = array(
-    'loop'            => true,//true - false
-    'autohide'            => 5000,//5000 - 0
+    'loop' => true,//true - false
+    'autohide' => 5000,//5000 - 0
   );
-  $query = "
-INSERT INTO " . CONFIG_TABLE . " (param,value,comment)
-VALUES ('smartpocket' , '".pwg_db_real_escape_string(serialize($config))."' , 'loop#autohide');";
-  pwg_query($query);
-  load_conf_from_db();
+
+  conf_update_param('smartpocket', $config, true);
 }
-elseif (count(unserialize( $conf['smartpocket'] ))!=2)
+elseif (count(safe_unserialize($conf['smartpocket'])) != 2)
 {
-  $conff=unserialize($conf['smartpocket']);
+  $conff = safe_unserialize($conf['smartpocket']);
   $config = array(
-    'loop'            => (!empty($conff['loop'])) ? $conff['loop'] :true,
-    'autohide'            => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
+    'loop' => (!empty($conff['loop'])) ? $conff['loop'] :true,
+    'autohide' => (!empty($conff['autohide'])) ? $conff['autohide'] :5000,
   );
-  conf_update_param('smartpocket', pwg_db_real_escape_string(serialize($config)));
-  load_conf_from_db();
+  conf_update_param('smartpocket', $config, true);
 }
 ?>

trunk/themes/smartpocket/themeconf.inc.php

@@ -110 +110 @@
 {
   global $template, $conf;
-  $config = unserialize( $conf['smartpocket'] );
+  $config = safe_unserialize( $conf['smartpocket'] );
   $template->assign( 'smartpocket', $config );
   if ( !empty($conf['mobile_theme']) && (get_device() != 'desktop' || mobile_theme()))