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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index fa57b678..ed706fe3 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -10,14 +10,23 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 
-function set_global_connection()
+function set_global_connection($company=-1)
 {
-	global $db;
+	global $db, $transaction_level, $db_connections;
+
+	cancel_transaction(); // cancel all aborted transactions if any
+	$transaction_level = 0;
+
+	if ($company == -1) 
+		$company = $_SESSION["wa_current_user"]->company;
+
+	$_SESSION["wa_current_user"]->cur_con = $company;
 
-    if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
-    	$db = $_SESSION["wa_current_user"]->get_db_connection();
-    else
-    	$db = null;
+	$connection = $db_connections[$company];
+
+	$db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
+		mysql_select_db($connection["dbname"], $db);
+	return $db;
 }
 
 $db_duplicate_error_code = 1062;
@@ -26,35 +35,37 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-	global $db, $show_sql, $sql_trail, $select_trail;
+	global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax,
+		$db_connections;
+	
+	// set current db prefix
+	$cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
 
-	//echo "<br>$sql<br>";
 	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) {
 		if ($select_trail || (strstr($sql, 'SELECT') === false)) {
 			mysql_query(
-			"INSERT INTO ".TB_PREF."sql_trail
+			"INSERT INTO ".$cur_prefix."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);
-	  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 +98,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 +110,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);
@@ -148,4 +160,56 @@ function db_num_affected_rows()
 	return mysql_affected_rows($db);
 }
 
-?>
+function db_field_name($result, $n)
+{
+	return mysql_field_name($result, $n);
+}
+
+function db_create_db($connection)
+{
+	$db = mysql_connect($connection["host"] ,
+		$connection["dbuser"], $connection["dbpassword"]);
+	if (!mysql_select_db($connection["dbname"], $db))
+	{
+		$sql = "CREATE DATABASE " . $connection["dbname"] . "";
+		if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
+			return 0;
+	}
+	return $db;
+}
+
+function db_drop_db($connection)
+{
+
+	if ($connection["tbpref"] == "")
+	{
+		$sql = "DROP DATABASE " . $connection["dbname"] . "";
+		return mysql_query($sql);
+	}
+	else
+	{
+    	$res = db_query("show table status");
+    	$all_tables = array();
+    	while($row = db_fetch($res))
+    		$all_tables[] = $row;
+        // get table structures
+		foreach ($all_tables as $table)
+		{
+			if (strpos($table['Name'], $connection["tbpref"]) === 0)
+				db_query("DROP TABLE `".$table['Name'] . "`");
+		}
+		//deleting the tables, how??
+		return true;
+	}
+}
+
+function db_close($dbase = null)
+{
+	global $db;
+	
+	if (!$dbase)
+		$dbase = $db;
+	return mysql_close($dbase);
+}
+
+?>
\ No newline at end of file