X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=fd6870e947ed121d58ec558a13a00561b523c3f5;hb=8110c7a16ca343e6a48658db2ab95a573e22118f;hp=cedfd787c09f110f977b4ec1f19f67592af84a7f;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index cedfd787..fd6870e9 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,8 +1,16 @@
 <?php
-
-set_global_connection();
-
-function 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()
 {
 	global $db;
 
@@ -18,8 +26,8 @@ $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;
+	
 	//echo "<br>$sql<br>";
 	if ($show_sql)
 	{
@@ -27,32 +35,51 @@ function db_query($sql, $err_msg=null)
 		echo "<pre>";
 		echo $sql;
 		echo "</pre>\n";
-	}	
+	}
 	
 
 	$result = mysql_query($sql, $db);
-
-	if ($err_msg != null)
-		check_db_error($err_msg, $sql);
-
+	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 || $go_debug) {
+		$exit = $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, $exit);
+		else
+			check_db_error($err_msg, $sql, $exit);
+	}
 	return $result;
 }
 
-function db_fetch_row (&$result) 
+function db_fetch_row ($result)
 {
 
 	return mysql_fetch_row($result);
 }
 
-function db_fetch (&$result) 
+function db_fetch_assoc ($result)
+{
+
+	return mysql_fetch_assoc($result);
+}
+
+function db_fetch ($result)
 {
 
-	return mysql_fetch_array(&$result);
+	return mysql_fetch_array($result);
 }
 
-function db_seek (&$result,$record) 
+function db_seek (&$result,$record)
 {
-	mysql_data_seek($result, $record);
+	return mysql_data_seek($result, $record);
 }
 
 function db_free_result ($result)
@@ -66,14 +93,37 @@ function db_num_rows (&$result)
 	return mysql_num_rows($result);
 }
 
-function db_num_fields (&$result)
+function db_num_fields ($result)
 {
 	return mysql_num_fields($result);
 }
 
-function db_escape (&$result)
+function db_escape($value = "", $nullify = false)
 {
-	return mysql_escape_string($result);
+	$value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+
+  	//reset default if second parameter is skipped
+	$nullify = ($nullify === null) ? (false) : ($nullify);
+
+  	//check for null/unset/empty strings
+	if ((!isset($value)) || (is_null($value)) || ($value === "")) {
+		$value = ($nullify) ? ("NULL") : ("''");
+	} else {
+		if (is_string($value)) {
+      		//value is a string and should be quoted; determine best method based on available extensions
+			if (function_exists('mysql_real_escape_string')) {
+		  		$value = "'" . mysql_real_escape_string($value) . "'";
+			} else {
+			  $value = "'" . mysql_escape_string($value) . "'";
+			}
+		} else if (!is_numeric($value)) {
+			//value is not a string nor numeric
+			display_error("ERROR: incorrect data type send to sql query");
+			echo '<br><br>';
+			exit();
+		}
+	}
+	return $value;
 }
 
 function db_error_no ()
@@ -82,7 +132,7 @@ function db_error_no ()
 	return mysql_errno($db);
 }
 
-function db_error_msg(&$conn)
+function db_error_msg($conn)
 {
 	return mysql_error($conn);
 }