X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=16b5be40f4c59c254af75cb26ac2367a77157383;hb=cef4b4de401511a4195b7b8ad04b47bec1895b20;hp=9616313f433d91e8187d54eacf25d1c0ad45b467;hpb=f6e1b649fc75750383b17c2ced6a5c1d6f19fe2e;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index 9616313f..16b5be40 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -1,60 +1,82 @@ . +***********************************************************************/ $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'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), - E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00')); - //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // display in message box. -// FIX: fatal errors ? function error_handler($errno, $errstr, $file, $line) { - global $messages; + 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'); + foreach($excluded_warnings as $ref) { + if (strpos($errstr, $ref) !== false) { + return true; + } + } // 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); + else if($errno&~E_NOTICE)// log all not displayed messages + error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':' + . basename($file) .":$line:" . ( $SysPrefs->db_ok ? '':'[before upgrade]') + . " $errstr"); + return true; } //------------------------------------------------------------------------------ // Formats system messages before insert them into message