Fixed duplicated groups in list selectors.

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index f65ddb4537b0b7167d23622db351274219602465..18c27ac9f7a35c45fba64a4ba1110eb6aadfcb53 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -18,7 +18,7 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql;
+       global $db, $show_sql, $sql_trail, $select_trail;
 
        //echo "<br>$sql<br>";
        if ($show_sql)
@@ -28,9 +28,19 @@ function db_query($sql, $err_msg=null)
                echo $sql;
                echo "</pre>\n";
        }
-
+       
 
        $result = mysql_query($sql, $db);
+       if($sql_trail) {
+               if ($select_trail || (strstr($sql, 'SELECT') === false)) {
+                       mysql_query(
+                       "INSERT INTO ".TB_PREF."sql_trail
+                               (`sql`, `result`, `msg`)
+                               VALUES(".db_escape($sql).",".($result ? 1 : 0).",
+                               ".db_escape($err_msg).")", $db);
+               }
+       }
+
        if ($err_msg != null)
          if (function_exists('xdebug_call_file'))
                check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql);
@@ -46,6 +56,12 @@ function db_fetch_row ($result)
        return mysql_fetch_row($result);
 }
 
+function db_fetch_assoc ($result)
+{
+
+       return mysql_fetch_assoc($result);
+}
+
 function db_fetch ($result)
 {
 
@@ -75,12 +91,10 @@ function db_num_fields ($result)
 
 function db_escape($value = "", $nullify = false)
 {
-       $value = htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+       $value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);
-       //undo slashes for poorly configured servers
-       $value = (get_magic_quotes_gpc()) ? (stripslashes($value)) : ($value);
 
        //check for null/unset/empty strings
        if ((!isset($value)) || (is_null($value)) || ($value === "")) {