X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdb%2Fconnect_db.inc;h=fda58ab32e1863a95b739bd74f52a1cb1f861d73;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=f7d214beb8b8904ccd8ed8ba8ba60370efdbaf50;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index f7d214be..fda58ab3 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,15 +1,32 @@
.
+***********************************************************************/
+
+function set_global_connection($company=-1)
+{
+ global $db, $transaction_level, $db_connections;
-set_global_connection();
+ cancel_transaction(); // cancel all aborted transactions if any
+ $transaction_level = 0;
-function set_global_connection()
-{
- global $db;
+ if ($company == -1)
+ $company = $_SESSION["wa_current_user"]->company;
+
+ $_SESSION["wa_current_user"]->cur_con = $company;
+
+ $connection = $db_connections[$company];
- if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
- $db = $_SESSION["wa_current_user"]->get_db_connection();
- else
- $db = null;
+ $db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
+ mysql_select_db($connection["dbname"], $db);
+ return $db;
}
$db_duplicate_error_code = 1062;
@@ -18,25 +35,39 @@ $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, $sql_queries, $Ajax,
+ $db_connections, $db_last_inserted_id;
+
+ // set current db prefix
+ $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+ $sql = str_replace(TB_PREF, $cur_prefix, $sql);
- //echo "
$sql
";
if ($show_sql)
{
- echo "SQL..";
- echo "
";
- echo $sql;
- echo "
\n";
+ $Ajax->activate('footer_debug');
+ $sql_queries .= "$sql
\n
";
}
-
$result = mysql_query($sql, $db);
- if ($err_msg != null)
- if (function_exists('xdebug_call_file'))
- check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql);
- else
- check_db_error($err_msg, $sql);
+ if($sql_trail) {
+ $db_last_inserted_id = mysql_insert_id($db); // preserve in case trail insert is done
+ if ($select_trail || (strstr($sql, 'SELECT') === false)) {
+ mysql_query(
+ "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 || $go_debug) {
+ $exit = $err_msg != null;
+ if (function_exists('xdebug_call_file'))
+ check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql, $exit);
+ else
+ check_db_error($err_msg, $sql, $exit);
+ }
return $result;
}
@@ -46,6 +77,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 +91,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 +100,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 +112,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 === "")) {
@@ -116,8 +152,9 @@ function db_error_msg($conn)
function db_insert_id()
{
- global $db;
- return mysql_insert_id($db);
+ global $db_last_inserted_id, $sql_trail, $db;
+
+ return $sql_trail ? $db_last_inserted_id : mysql_insert_id($db);
}
function db_num_affected_rows()
@@ -126,4 +163,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