X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=203883b084e0a1fdb90f8c8be1296618cd4c162e;hb=c51f4515e92fc251aa51b7809d4514161655fa37;hp=f7d214beb8b8904ccd8ed8ba8ba60370efdbaf50;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index f7d214be..203883b0 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,15 +1,20 @@
 <?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()
 {
 	global $db;
 
-    if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
-    	$db = $_SESSION["wa_current_user"]->get_db_connection();
-    else
-    	$db = null;
+   	$db = $_SESSION["wa_current_user"]->get_db_connection();
 }
 
 $db_duplicate_error_code = 1062;
@@ -18,9 +23,8 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-	global $db, $show_sql;
-
-	//echo "<br>$sql<br>";
+	global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+	
 	if ($show_sql)
 	{
 		echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
@@ -28,15 +32,26 @@ function db_query($sql, $err_msg=null)
 		echo $sql;
 		echo "</pre>\n";
 	}
-
+	
 
 	$result = mysql_query($sql, $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);
-	  else
-		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;
 }
 
@@ -46,6 +61,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 +75,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)
@@ -63,7 +84,7 @@ function db_free_result ($result)
 		mysql_free_result($result);
 }
 
-function db_num_rows (&$result)
+function db_num_rows ($result)
 {
 	return mysql_num_rows($result);
 }
@@ -75,12 +96,11 @@ function db_num_fields ($result)
 
 function db_escape($value = "", $nullify = false)
 {
-	$value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+	$value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+	$value = @htmlspecialchars($value, ENT_QUOTES, $_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 === "")) {