X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=a54abba810f3adf87d950d29f6c763dd6a5f81da;hb=3a07ab5b09141aa056c2c628f4f9fec79f45e85b;hp=937270eac3f4c5149371710f5f8ba9cdd48b8458;hpb=e39484e47bb3d664d75b2df63b7eda70980e0f1c;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index 937270ea..a54abba8 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -21,7 +21,8 @@ function get_backtrace($html = false, $skip=0) foreach($trace as $trn => $tr) { if ($trn <= $skip) continue; if ($html) $str .= ''; - $str .= $tr['file'].':'.$tr['line'].': '; + if (isset($tr['file']) && isset($tr['line'])) + $str .= $tr['file'].':'.$tr['line'].': '; if ($html) $str .= ''; if (isset($tr['type'])) { if($tr['type'] == '::') { @@ -32,7 +33,7 @@ function get_backtrace($html = false, $skip=0) } $str .= $tr['function'].'('; - if(is_array($tr['args'])) { + if(isset($tr['args']) && is_array($tr['args'])) { $args = array(); foreach($tr['args'] as $n=>$a) { if (is_object($tr['args'][$n])) @@ -56,7 +57,7 @@ function get_backtrace($html = false, $skip=0) // display in message box. function error_handler($errno, $errstr, $file, $line) { - global $messages, $SysPrefs; + global $messages, $SysPrefs, $cur_error_level; // skip well known warnings we don't care about. // Please use restrainedly to not risk loss of important messages @@ -71,68 +72,76 @@ function error_handler($errno, $errstr, $file, $line) { } } - $bt = $SysPrefs->go_debug>1 ? get_backtrace(true, 1) : array(); + $bt = isset($SysPrefs) && $SysPrefs->go_debug>1 ? get_backtrace(true, 1) : array(); - // error_reporting==0 when messages are set off with @ - 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 && $errstr != '') { // 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"); + // error_reporting!=cur_error_level when messages are set off with @ + if ($cur_error_level == error_reporting()) { + if ($errno & $cur_error_level) { + // 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 && $errstr != '') { // 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; } + +function exception_handler($exception) +{ + error_handler(E_ERROR, sprintf(_("Unhandled exception [%s]: %s."), $exception->getCode(), $exception->getMessage()), + $exception->getFile(), $exception->getLine()); + end_page(); +} //------------------------------------------------------------------------------ // Formats system messages before insert them into message
// FIX center is unused now function fmt_errors($center=false) { global $messages, $path_to_root, $SysPrefs; - $msg_class = array( - E_USER_ERROR => 'err_msg', - E_USER_WARNING =>'warn_msg', - E_USER_NOTICE => 'note_msg'); - - $type = E_USER_NOTICE; - $content = ''; -// $class = 'no_msg'; - if (count($messages)) { - foreach($messages as $cnt=>$msg) { - if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE) - $msg[0] = E_ERROR; - - if ($msg[0]>$type) continue; - - if ($msg[0]<$type) { - if ($msg[0] == E_USER_WARNING) { - $type = E_USER_WARNING; // user warnings - $content = ''; // clean notices when we have errors - } else { - $type = E_USER_ERROR; // php or user errors - if($type == E_USER_WARNING) - $content = ''; // clean other messages + $msg_class = array( + E_USER_ERROR => 'err_msg', + E_USER_WARNING =>'warn_msg', + E_USER_NOTICE => 'note_msg'); + + $type = E_USER_NOTICE; + $content = ''; + + if (count($messages)) { + foreach($messages as $cnt=>$msg) { + if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE) + $msg[0] = E_ERROR; + + if ($msg[0]>$type) continue; + + if ($msg[0]<$type) { + if ($msg[0] == E_USER_WARNING) { + $type = E_USER_WARNING; // user warnings + $content = ''; // clean notices when we have errors + } else { + $type = E_USER_ERROR; // php or user errors + if($type == E_USER_WARNING) + $content = ''; // clean other messages + } } - } - $str = $msg[1]; - 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]; + $str = $msg[1]; + 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 ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING) - $str .= '
'.$msg[4]; - $content .= ($cnt ? '
' : '').$str; - } - $class = $msg_class[$type]; - $content = "
$content
"; - } else - if ($path_to_root=='.') - return ''; - return $content; + if ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING) + $str .= '
'.$msg[4]; + $content .= ($cnt ? '
' : '').$str; + } + $class = $msg_class[$type]; + $content = "
$content
"; + } elseif ($path_to_root=='.') + return ''; + return $content; } //----------------------------------------------------------------------------- // Error box
element. @@ -142,7 +151,7 @@ function error_box() { echo "
"; -// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2 + // Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2 $before_box = ob_get_clean(); // save html content before error box ob_start('output_html'); echo "
"; @@ -173,7 +182,6 @@ function display_db_error($msg, $sql_statement=null, $exit=true) $warning = $msg==null; $db_error = db_error_no(); -// $str = "" . _("DATABASE ERROR :") . " $msg
"; if($warning) $str = "" . _("Debug mode database warning:") . "
"; else @@ -190,7 +198,6 @@ function display_db_error($msg, $sql_statement=null, $exit=true) $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 ($SysPrefs->go_debug > 1) display_backtrace(); } $str .= "

"; @@ -226,12 +233,12 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ { if ($SysPrefs->go_debug || !frindly_db_error($db_error)) { - display_db_error($msg, $sql_statement, false); + display_db_error($msg, $sql_statement, false); } if ($rollback_if_error) { - $rollback_result = db_query("rollback"); + $rollback_result = db_query("rollback"); } if ($exit_if_error)