X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=7654ba70e676320c24f1ea088bfc83293f97f814;hb=076aabe0c83753d9384e53d071b34ee51b8c43b8;hp=a23c6d3fcae6123ae60bd832c3024ef59939966c;hpb=666923451a9aaae922c33d19c014fb43f8c8bc8d;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index a23c6d3f..7654ba70 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -12,45 +12,53 @@ $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, $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', // 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; + } + } + // error_reporting==0 when messages are set off with @ - if ($errno) { - if(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"); + if ($errno & error_reporting()) { + $messages[] = array($errno, $errstr, $file, $line); + } + 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; } //------------------------------------------------------------------------------ // Formats system messages before insert them into message