X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=56574f32ab74fb0e862f3b1297046c22bcb76be9;hb=7010ff2972dfbc8be4e577bdeac6b8da7278b691;hp=500d7e606ada7e1eb0020d996d1c39e313e2af74;hpb=8eacc919cc5fce2d2ddd69a650c33c881828c76d;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index 500d7e60..56574f32 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -12,28 +12,80 @@ $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 .= ''; + } + + 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 .= ')
'; + return $str; +} + //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // 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 - $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 + 'mysql extension is deprecated' // ignore strict warning in 5.4 + ); 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); - else if($errno&~E_NOTICE)// log all not displayed messages - error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':' - . basename($file) .":$line: $errstr"); + if ($errno & error_reporting()) { + // suppress duplicated errors + if (!in_array(array($errno, $errstr, $file, $line, @$bt), $messages)) + $messages[] = array($errno, $errstr, $file, $line, @$bt); + } + else if($errno&~E_NOTICE) { // log all not displayed messages + $user = @$_SESSION["wa_current_user"]->loginname; + $context = isset($SysPrefs) && !$SysPrefs->db_ok ? '[before upgrade]' : ''; + error_log(user_company() . ":$user:". basename($file) .":$line:$context $errstr"); + } return true; } @@ -41,7 +93,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', @@ -53,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) { @@ -65,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 @@ -84,27 +143,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 () { +function end_flush() { global $Ajax; if (isset($Ajax)) $Ajax->run(); - if (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(); } 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(); @@ -123,14 +189,21 @@ 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 .= "

"; - 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; } @@ -162,7 +235,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($rollback_if_error) { - $rollback_result = db_query("rollback","could not rollback"); + $rollback_result = db_query("rollback"); } if ($exit_if_error)