X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=1bbc71ff3ea917dc1af36380dd72109958100804;hb=b3364aceecbf38109924c6ee1d48a28db78ad725;hp=eb06ff127dd84060e6469bdee5b44d16db3f0593;hpb=214715ef27ce057ee063ad53a13cc72e9984d0fa;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index eb06ff12..1bbc71ff 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -12,45 +12,47 @@ $messages = array(); // container for system messages $before_box = ''; // temporary container for output html data before error box -$msg_colors = array( - E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), - E_USER_WARNING => array('bg'=>'#ffff00', 'txt'=>'#ff5500', 'bd'=>'#ff9900'), - E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00')); - //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // display in message box. function error_handler($errno, $errstr, $file, $line) { - global $messages; + global $messages, $go_debug; + + // 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'); + foreach($excluded_warnings as $ref) { + if (strpos($errstr, $ref) !== false) { + return true; + } + } // error_reporting==0 when messages are set off with @ - if ($errno) { - if(error_reporting()) + if ($errno & error_reporting()) $messages[] = array($errno, $errstr, $file, $line); - - $ignored = E_USER_WARNING|E_USER_ERROR|E_USER_NOTICE; - // don't log notices hidden with @ unless in debug mode - if (!$go_debug) $ignored |= E_NOTICE; - - if (!($errno & $ignored)) - error_log( - user_company().':'.$_SESSION["wa_current_user"]->loginname.':'. - basename($file).":$line: $errstr"); - } + else if($errno&~E_NOTICE)// log all not displayed messages + error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':' + . basename($file) .":$line: $errstr"); + return true; } //------------------------------------------------------------------------------ // Formats system messages before insert them into message
// FIX center is unused now -function fmt_errors($center=true) { - global $messages, $msg_colors; +function fmt_errors($center=false) { + global $messages, $path_to_root; + $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)) { - $content = ''; - foreach($messages as $msg) { + foreach($messages as $cnt=>$msg) { if ($msg[0]>$type) continue; if ($msg[0]<$type) { @@ -64,23 +66,16 @@ function fmt_errors($center=true) { } } $str = $msg[1]; - $c = $msg_colors[$type]; if ($msg[0] < E_USER_ERROR && $msg[2] != null) $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3]; - - $content .= "" - .$str.""; - } - - $str = "
" - . $content . "

\n"; - - } - else - $str = ''; - - return $str; + $content .= ($cnt ? '
' : '').$str; + } + $class = $msg_class[$type]; + $content = "
$content
"; + } else + if ($path_to_root=='.') + return ''; + return $content; } //----------------------------------------------------------------------------- // Error box
element. @@ -89,19 +84,31 @@ function error_box() { global $before_box; echo "
"; - $before_box = ob_get_clean(); // save html content before error box + $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('ob_end_flush'); + register_shutdown_function('end_flush'); ob_start('output_html'); echo "
"; } +/* + Helper to avoid sparse log notices. +*/ +function end_flush () { + if (ob_get_level()) ob_end_flush(); +} function display_db_error($msg, $sql_statement=null, $exit=true) { global $db, $debug; + + $warning = $msg==null; $db_error = db_error_no(); - $str = "" . _("DATABASE ERROR :") . " $msg
"; +// $str = "" . _("DATABASE ERROR :") . " $msg
"; + if($warning) + $str = "" . _("Debug mode database warning:") . "
"; + else + $str = "" . _("DATABASE ERROR :") . " $msg
"; if ($db_error != 0) { @@ -115,20 +122,23 @@ function display_db_error($msg, $sql_statement=null, $exit=true) } $str .= "

"; - - trigger_error($str, E_USER_ERROR); - + 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; } -function frindly_db_error($db_error) +function frindly_db_error($db_error, $sql) { - global $db_duplicate_error_code; + global $db_duplicate_error_code, $go_debug; if ($db_error == $db_duplicate_error_code) - { - display_error(_("The entered information is a duplicate. Please go back and enter different values.")); + { $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); return true; } @@ -143,8 +153,9 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($db_error != 0) { - if (!frindly_db_error($db_error)) - display_db_error($msg, $sql_statement, false); + if (!frindly_db_error($db_error, $sql_statement)) { + display_db_error($msg, $sql_statement, false); + } if ($rollback_if_error) { @@ -153,8 +164,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($exit_if_error) { - echo "

"; - exit; + end_page(); exit; } } return $db_error;