{
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;
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;
+
if ($show_sql)
{
echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
}
}
- 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;
}
mysql_free_result($result);
}
-function db_num_rows (&$result)
+function db_num_rows ($result)
{
return mysql_num_rows($result);
}
function db_escape($value = "", $nullify = false)
{
+ $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