X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=c584d175f79e831d3855d0fb672910e55c8df844;hb=b9c390e62949efc04b016a87631c18eb70e7870e;hp=bfa213d5514d96ab1ac59e87e22fa8ffcc2619ba;hpb=06940c9e0027a680907344518ed27f62b89a63f3;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index bfa213d5..c584d175 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,7 +17,7 @@ $before_box = ''; // temporary container for output html data before error box
// display in message box.
function error_handler($errno, $errstr, $file, $line) {
- global $messages, $go_debug;
+ global $messages, $go_debug, $SysPrefs;
// skip well known warnings we don't care about.
// Please use restrainedly to not risk loss of important messages
@@ -27,13 +27,14 @@ function error_handler($errno, $errstr, $file, $line) {
return true;
}
}
-
+
// error_reporting==0 when messages are set off with @
if ($errno & error_reporting())
$messages[] = array($errno, $errstr, $file, $line);
else if($errno&~E_NOTICE)// log all not displayed messages
error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':'
- . basename($file) .":$line: $errstr");
+ . basename($file) .":$line:" . ( $SysPrefs->db_ok ? '':'[before upgrade]')
+ . " $errstr");
return true;
}
@@ -84,22 +85,30 @@ function error_box() {
global $before_box;
echo "
";
- $before_box = ob_get_clean(); // save html content before error box
+
// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
- register_shutdown_function('end_flush');
+ $before_box = ob_get_clean(); // save html content before error box
ob_start('output_html');
echo "
";
}
/*
Helper to avoid sparse log notices.
*/
-function end_flush () {
- if (ob_get_level()) ob_end_flush();
+function end_flush() {
+ global $Ajax, $transaction_level;
+
+ if (isset($Ajax))
+ $Ajax->run();
+ // flush all output buffers (works also with exit inside any div levels)
+ while(ob_get_level()) ob_end_flush();
+
+ // if any transaction was aborted unexpectedly rollback changes
+ cancel_transaction();
}
function display_db_error($msg, $sql_statement=null, $exit=true)
{
- global $db, $debug;
+ global $db, $debug, $go_debug, $db_connections;
$warning = $msg==null;
$db_error = db_error_no();
@@ -118,7 +127,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
if ($debug == 1)
{
- $str .= "sql that failed was : " . $sql_statement . "
";
+ $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+
+ $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."
";
+ if ($go_debug > 1) display_backtrace();
}
$str .= "
";
@@ -135,7 +147,7 @@ function frindly_db_error($db_error)
global $db_duplicate_error_code;
if ($db_error == $db_duplicate_error_code)
- {
+ {
display_error(_("The entered information is a duplicate. Please go back and enter different values."));
return true;
}
@@ -145,19 +157,19 @@ function frindly_db_error($db_error)
function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
{
- global $db;
+ global $db, $go_debug;
$db_error = db_error_no();
if ($db_error != 0)
{
- if (!frindly_db_error($db_error)) {
+ if ($go_debug || !frindly_db_error($db_error)) {
display_db_error($msg, $sql_statement, false);
}
if ($rollback_if_error)
{
- $rollback_result = db_query("rollback","could not rollback");
+ $rollback_result = db_query("rollback");
}
if ($exit_if_error)