X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=6f9a243299c391f0f2330145773872d6bfc22cda;hb=0c794db98d716ec8823435d8423c98a12bebba66;hp=1bbc71ff3ea917dc1af36380dd72109958100804;hpb=bb218a322637d3c15a65866d1c236779560ca484;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 1bbc71ff..6f9a2432 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',
@@ -53,6 +102,9 @@ function fmt_errors($center=false) {
// $class = 'no_msg';
if (count($messages)) {
foreach($messages as $cnt=>$msg) {
+ if ($go_debug && $msg[0]>E_USER_NOTICE)
+ $msg[0] = E_ERROR;
+
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
@@ -65,11 +117,15 @@ function fmt_errors($center=false) {
$content = ''; // clean other messages
}
}
+
$str = $msg[1];
- if ($msg[0] < E_USER_ERROR && $msg[2] != null)
+ if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $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 +140,34 @@ 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;
+
+ if (isset($Ajax))
+ $Ajax->run();
+
+ // on some (but not all) php versions zlib extension adds 1 additional level of buffering,
+ // so flush the last buffer outside the loop to be on safe side
+ while(ob_get_level() > 1)
+ ob_end_flush();
+ @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 +186,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 .= "
";
@@ -130,15 +201,13 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
exit;
}
-function frindly_db_error($db_error, $sql)
+function frindly_db_error($db_error)
{
- global $db_duplicate_error_code, $go_debug;
+ global $db_duplicate_error_code;
if ($db_error == $db_duplicate_error_code)
- { $msg = _("The entered information is a duplicate. Please go back and enter different values.");
- if ($go_debug)
- $msg .= '
Sql that failed was :
'.$sql;
- display_error($msg);
+ {
+ display_error(_("The entered information is a duplicate. Please go back and enter different values."));
return true;
}
@@ -147,19 +216,19 @@ function frindly_db_error($db_error, $sql)
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, $sql_statement)) {
+ 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)