[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.45, 1.46

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv64600/system/classes

Modified Files:
	config.class.php 
Log Message:
$sql_query -> $sql for consistency (and to prevent stupid copy&paste errors like the one I made ...)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** config.class.php	4 Jul 2008 14:46:07 -0000	1.45
--- config.class.php	7 Jul 2008 10:10:01 -0000	1.46
***************
*** 109,114 ****
          global $_TABLES;
  
!         $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')";
!         $result = DB_query($sql_query);
          while ($row = DB_fetchArray($result)) {
              if ($row[1] !== 'unset') {
--- 109,114 ----
          global $_TABLES;
  
!         $sql = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')";
!         $result = DB_query($sql);
          while ($row = DB_fetchArray($result)) {
              if ($row[1] !== 'unset') {
***************
*** 163,170 ****
          $escaped_name = addslashes($name);
          $escaped_grp = addslashes($group);
!         $sql_query = "UPDATE {$_TABLES['conf_values']} " .
!             "SET value = '{$escaped_val}' WHERE " .
!             "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'";
!         $this->_DB_escapedQuery($sql_query);
          $this->config_array[$group][$name] = $value;
          $this->_post_configuration();
--- 163,170 ----
          $escaped_name = addslashes($name);
          $escaped_grp = addslashes($group);
!         $sql = "UPDATE {$_TABLES['conf_values']} " .
!                "SET value = '{$escaped_val}' WHERE " .
!                "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'";
!         $this->_DB_escapedQuery($sql);
          $this->config_array[$group][$name] = $value;
          $this->_post_configuration();
***************
*** 187,194 ****
          $escaped_name = addslashes($name);
          $escaped_grp = addslashes($group);
!         $sql_query = "UPDATE {$_TABLES['conf_values']} " .
!             "SET default_value = '{$escaped_val}' WHERE " .
!             "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'";
!         $this->_DB_escapedQuery($sql_query);
      }
  
--- 187,194 ----
          $escaped_name = addslashes($name);
          $escaped_grp = addslashes($group);
!         $sql = "UPDATE {$_TABLES['conf_values']} " .
!                "SET default_value = '{$escaped_val}' WHERE " .
!                "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'";
!         $this->_DB_escapedQuery($sql);
      }
  
***************
*** 284,290 ****
                         serialize($default_value));
          $Qargs = array_map('addslashes', $Qargs);
!         $sql_query = vsprintf($format, $Qargs);
  
!         $this->_DB_escapedQuery($sql_query);
  
          $this->config_array[$group][$param_name] = $default_value;
--- 284,290 ----
                         serialize($default_value));
          $Qargs = array_map('addslashes', $Qargs);
!         $sql = vsprintf($format, $Qargs);
  
!         $this->_DB_escapedQuery($sql);
  
          $this->config_array[$group][$param_name] = $default_value;
***************
*** 853,858 ****
  
          if ($_DB_dbms == 'mssql') {
!             $sql_query = str_replace("\\'", "''", $sql_query);
!             $sql_query = str_replace('\\"', '"', $sql_query);
              $_DB->dbQuery($sql, 0, 1);
          } else {
--- 853,858 ----
  
          if ($_DB_dbms == 'mssql') {
!             $sql = str_replace("\\'", "''", $sql);
!             $sql = str_replace('\\"', '"', $sql);
              $_DB->dbQuery($sql, 0, 1);
          } else {