X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=7654ba70e676320c24f1ea088bfc83293f97f814;hb=ced25a469db48fa4badfcc96e09e414193fe0377;hp=a9b68898498fb0e4f9854e678ad155b86a3bfa57;hpb=fab37f3012d8b02fa039f5c7b6f37100bec4d1b2;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index a9b68898..7654ba70 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -17,23 +17,29 @@ $before_box = ''; // temporary container for output html data before error box // 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 + ); 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); - 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()) { + $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; } @@ -84,22 +90,30 @@ function error_box() { global $before_box; echo "