X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=5babac1bd4f3676bd5f6d2874df2e37cb6ca736f;hb=bb991dc5b071e966b39954bb53d3b0efe8420938;hp=fa57b678fc4d530e3f98961a96725ee93cb74487;hpb=4cf1c3dbb9ae74e0c47dda456f7ac97c7659b3fa;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index fa57b678..5babac1b 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -12,12 +12,12 @@
 
 function set_global_connection()
 {
-	global $db;
+	global $db, $transaction_level;
+
+	cancel_transaction(); // cancel all aborted transactions if any
+	$transaction_level = 0;
 
-    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;
@@ -26,17 +26,13 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-	global $db, $show_sql, $sql_trail, $select_trail;
-
-	//echo "<br>$sql<br>";
+	global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax;
+	
 	if ($show_sql)
 	{
-		echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
-		echo "<pre>";
-		echo $sql;
-		echo "</pre>\n";
+		$Ajax->activate('footer_debug');
+		$sql_queries .= "<pre>$sql</pre>\n<hr>";
 	}
-	
 
 	$result = mysql_query($sql, $db);
 	if($sql_trail) {
@@ -49,12 +45,13 @@ function db_query($sql, $err_msg=null)
 		}
 	}
 
-	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 ($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;
 }
 
@@ -87,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);
 }
@@ -99,7 +96,8 @@ 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);