X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=9687b6ddef3b4c21f75cda759e79295d14b10ca9;hb=8b6f1cc34cb15697b33470ff2ce7afeb9996ac11;hp=f55951cf4652c1cc69d4f8f0a2bb0c070fc71626;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index f55951cf..9687b6dd 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 .= '
';
+ $trace = debug_backtrace();
+
+ foreach($trace as $trn => $tr) {
+ if ($trn <= $skip) continue;
+ if ($html) $str .= '';
+ $str .= $tr['file'].':'.$tr['line'].': ';
+ if ($html) $str .= ' | ';
+ if (isset($tr['type'])) {
+ if($tr['type'] == '::') {
+ $str .= $tr['class'].'::';
+ } else if($tr['type'] == '->') {
+ $str .= '('.$tr['class'].' Object)'.'->';
+ }
+ }
+ $str .= $tr['function'].'(';
+
+ if(is_array($tr['args'])) {
+ $args = array();
+ foreach($tr['args'] as $n=>$a) {
+ if (is_object($tr['args'][$n]))
+ $args[$n] = "(".get_class($tr['args'][$n])." Object)";
+ elseif (is_array($tr['args'][$n]))
+ $args[$n] = "(Array[".count($tr['args'][$n])."])";
+ else
+ $args[$n] = "'".$tr['args'][$n]."'";
+ }
+ $str .= implode(',',$args);
+ }
+ $str .= ') | ';
+ }
+
+ if ($html) $str .= '
';
+ return $str;
+}
+
//-----------------------------------------------------------------------------
// Error handler - collects all php/user messages for
// display in message box.
@@ -21,16 +60,23 @@ function error_handler($errno, $errstr, $file, $line) {
// skip well known warnings we don't care about.
// Please use restrainedly to not risk loss of important messages
- $excluded_warnings = array('html_entity_decode', 'htmlspecialchars');
+ $excluded_warnings = array(
+ 'html_entity_decode', 'htmlspecialchars', // nevermind encodings, special chars are processed anyway
+ 'should be compatible with that' // ignore cpdf/frontreport wrapper warnings
+ );
foreach($excluded_warnings as $ref) {
if (strpos($errstr, $ref) !== false) {
return true;
}
}
-
+
+ if ($go_debug>1) {
+ $bt = get_backtrace(true, 1);
+ }
+
// error_reporting==0 when messages are set off with @
if ($errno & error_reporting()) {
- $messages[] = array($errno, $errstr, $file, $line);
+ $messages[] = array($errno, $errstr, $file, $line, @$bt);
}
else if($errno&~E_NOTICE) { // log all not displayed messages
$user = @$_SESSION["wa_current_user"]->loginname;
@@ -44,7 +90,7 @@ function error_handler($errno, $errstr, $file, $line) {
// Formats system messages before insert them into message
// 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',
@@ -71,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