Fixed error handling (logged in debug instead of production mode).

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index 459b306211722122f9dd0b46225051e6645ccc77..56574f32ab74fb0e862f3b1297046c22bcb76be9 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -62,7 +62,8 @@ function error_handler($errno, $errstr, $file, $line) {
        // 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
+               'should be compatible with that',                       // ignore cpdf/frontreport wrapper warnings
+               'mysql extension is deprecated'                         // ignore strict warning in 5.4
        );
        foreach($excluded_warnings as $ref) {
                if (strpos($errstr, $ref) !== false) {
@@ -76,7 +77,9 @@ function error_handler($errno, $errstr, $file, $line) {
 
        // error_reporting==0 when messages are set off with @ 
        if ($errno & error_reporting()) {
-               $messages[] = array($errno, $errstr, $file, $line, @$bt);
+               // 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) { // log all not displayed messages 
                $user = @$_SESSION["wa_current_user"]->loginname;
@@ -150,12 +153,16 @@ function error_box() {
        Helper to avoid sparse log notices.
 */
 function end_flush() {
-       global $Ajax, $transaction_level;
+       global $Ajax;
 
        if (isset($Ajax))
                $Ajax->run();
-       // flush all output buffers (works also with exit inside any div levels)
-       while(ob_get_level()) ob_end_flush();
+
+        // on some (but not all) php versions zlib extension adds 1 additional level of buffering, 
+        // so flush the last buffer outside the loop to be on safe side 
+       while(ob_get_level() > 1)
+               ob_end_flush();
+       @ob_end_flush();
 
        // if any transaction was aborted unexpectedly rollback changes
        cancel_transaction();
@@ -189,10 +196,14 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
        }
        
        $str .= "<br><br>";
-       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 (!$go_debug)
+               error_log($str);
+       else {
+               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;
 }