X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=56574f32ab74fb0e862f3b1297046c22bcb76be9;hb=e79c80704f4d0bc3d3792365dfd7ebf32f9b4227;hp=7654ba70e676320c24f1ea088bfc83293f97f814;hpb=9e888e369c2efd972d959f2b07816df68b822fcf;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 7654ba70..56574f32 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -12,6 +12,45 @@
$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',
@@ -59,6 +105,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) {
@@ -71,11 +120,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
@@ -100,12 +153,16 @@ function error_box() {
Helper to avoid sparse log notices.
*/
function end_flush() {
- global $Ajax, $transaction_level;
+ global $Ajax;
if (isset($Ajax))
$Ajax->run();
- // flush all output buffers (works also with exit inside any div levels)
- while(ob_get_level()) ob_end_flush();
+
+ // 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();
@@ -139,10 +196,14 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
}
$str .= "
";
- if($msg)
- trigger_error($str, E_USER_ERROR);
- else // $msg can be null here only in debug mode, otherwise the error is ignored
- trigger_error($str, E_USER_WARNING);
+ if (!$go_debug)
+ error_log($str);
+ else {
+ if($msg)
+ trigger_error($str, E_USER_ERROR);
+ else // $msg can be null here only in debug mode, otherwise the error is ignored
+ trigger_error($str, E_USER_WARNING);
+ }
if ($exit)
exit;
}