X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=9687b6ddef3b4c21f75cda759e79295d14b10ca9;hb=8b6f1cc34cb15697b33470ff2ce7afeb9996ac11;hp=bfa213d5514d96ab1ac59e87e22fa8ffcc2619ba;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index bfa213d5..9687b6dd 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -12,28 +12,77 @@
$messages = array(); // container for system messages
$before_box = ''; // temporary container for output html data before error box
+function get_backtrace($html = false, $skip=0)
+{
+ $str = '';
+ if ($html) $str .= '
// FIX center is unused now
function fmt_errors($center=false) {
- global $messages, $path_to_root;
+ global $messages, $path_to_root, $go_debug;
$msg_class = array(
E_USER_ERROR => 'err_msg',
@@ -68,8 +117,10 @@ function fmt_errors($center=false) {
$str = $msg[1];
if ($msg[0] < E_USER_ERROR && $msg[2] != null)
$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
+ if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+ $str .= '
'.$msg[4];
$content .= ($cnt ? '
' : '').$str;
- }
+ }
$class = $msg_class[$type];
$content = "
$content
";
} else
@@ -84,22 +135,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 +177,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 +197,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 +207,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)