Merged changes in main branch up to v.2.1.2

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index f7d214beb8b8904ccd8ed8ba8ba60370efdbaf50..dc2dd027ede11c4aadcb1acafbed14be6c8b30fa 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,6 +1,14 @@
 <?php
-
-set_global_connection();
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 
 function set_global_connection()
 {
@@ -18,8 +26,10 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql;
-
+       global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+       
+       if (!$err_msg && $go_debug) 
+               $err_msg = "Debug mode error";
        //echo "<br>$sql<br>";
        if ($show_sql)
        {
@@ -28,9 +38,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 +66,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)
 {
 
@@ -54,7 +80,7 @@ function db_fetch ($result)
 
 function db_seek (&$result,$record)
 {
-       mysql_data_seek($result, $record);
+       return mysql_data_seek($result, $record);
 }
 
 function db_free_result ($result)
@@ -79,8 +105,6 @@ function db_escape($value = "", $nullify = false)
 
        //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 === "")) {