Merged changes from stable branch up to 2.3.23.

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

diff --git a/includes/errors.inc b/includes/errors.inc
index 9b40fa9f887e4c08c2b25f758319463e59d0d12f..1bf3b3bdeb37235af8f69a5ba7f1719b28cbbffd 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -56,13 +56,14 @@ function get_backtrace($html = false, $skip=0)
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages, $go_debug, $SysPrefs;
+    global $messages, $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
+               'html_entity_decode',                           // nevermind encodings, special chars are processed anyway
+               '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) {
@@ -70,13 +71,13 @@ function error_handler($errno, $errstr, $file, $line) {
                }
        }
 
-       if ($go_debug>1) {
-               $bt = get_backtrace(true, 1);
-       }
+       $bt = $SysPrefs->go_debug>1 ? get_backtrace(true, 1) : array();
 
        // 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;
@@ -90,7 +91,7 @@ function error_handler($errno, $errstr, $file, $line) {
 //     Formats system messages before insert them into message <div>
 // FIX center is unused now
 function fmt_errors($center=false) {
-    global $messages, $path_to_root, $go_debug;
+    global $messages, $path_to_root, $SysPrefs;
 
   $msg_class = array(
        E_USER_ERROR => 'err_msg',
@@ -102,7 +103,7 @@ function fmt_errors($center=false) {
 //  $class = 'no_msg';
   if (count($messages)) {
        foreach($messages as $cnt=>$msg) {
-               if ($go_debug && $msg[0]>E_USER_NOTICE)
+               if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE)
                        $msg[0] = E_ERROR;
 
                if ($msg[0]>$type) continue;
@@ -122,7 +123,7 @@ function fmt_errors($center=false) {
                if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
                  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
 
-               if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+               if ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
                  $str .= '<br>'.$msg[4];
                $content .= ($cnt ? '<hr>' : '').$str;
        }
@@ -167,7 +168,7 @@ function end_flush() {
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {
-       global $db, $debug, $go_debug, $db_connections;
+       global $db, $SysPrefs, $db_connections;
 
        $warning = $msg==null;
        $db_error = db_error_no();
@@ -184,29 +185,31 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
                $str .= "error message : " . db_error_msg($db) . "<br>";
        }
        
-       if ($debug == 1) 
+       if ($SysPrefs->debug == 1) 
        {
                $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
 
                $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."<br>";
-//             if ($go_debug > 1) display_backtrace();
+//             if ($SysPrefs->go_debug > 1) display_backtrace();
        }
        
        $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 (!$SysPrefs->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;
 }
 
 function frindly_db_error($db_error)
 {
-       global $db_duplicate_error_code;
-       
-       if ($db_error == $db_duplicate_error_code) 
-       {       
+       if ($db_error == DB_DUPLICATE_ERROR) 
+       {
                display_error(_("The entered information is a duplicate. Please go back and enter different values."));
                return true;
        }
@@ -216,13 +219,13 @@ function frindly_db_error($db_error)
 
 function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
 {
-       global $db, $go_debug;
+       global $db, $SysPrefs;
        $db_error = db_error_no();
        
        if ($db_error != 0) 
        {
                
-               if ($go_debug || !frindly_db_error($db_error)) {
+               if ($SysPrefs->go_debug || !frindly_db_error($db_error)) {
                                display_db_error($msg, $sql_statement, false);
                }
                
@@ -236,7 +239,6 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
                        end_page(); exit;
                }
        }
-       return $db_error;               
+       return $db_error;
 }
 
-?>
\ No newline at end of file