Merged changes from main branch up to 2.1.3.

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

diff --git a/includes/errors.inc b/includes/errors.inc
index 160d41e5100dce8fe0d84bda8dd4d55b9c516f8f..566d9f49eddbcdec19e5e1fb0cfecb1a2f95df55 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,12 +17,15 @@ $before_box = ''; // temporary container for output html data before error box
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages;
+    global $messages, $go_debug;
 
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting()) {
-               $messages[] = array($errno, $errstr, $file, $line);
-       }
+       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");
+       
     return true;
 }
 //------------------------------------------------------------------------------
@@ -38,7 +41,7 @@ function fmt_errors($center=false) {
 
   $type = E_USER_NOTICE;
   $content = '';
-  $class = 'no_msg';
+//  $class = 'no_msg';
   if (count($messages)) {
        foreach($messages as $cnt=>$msg) {
                if ($msg[0]>$type) continue;
@@ -59,11 +62,10 @@ function fmt_errors($center=false) {
                $content .= ($cnt ? '<hr>' : '').$str;
        }               
        $class = $msg_class[$type];
+    $content = "<div class='$class'>$content</div>";
   } else
-   if ($path_to_root=='.')
-    return '';
-  
-  $content = "<div class='$class'>$content</div>";
+  if ($path_to_root=='.')
+       return '';
   return $content;
 }
 //-----------------------------------------------------------------------------
@@ -73,19 +75,31 @@ function error_box() {
     global $before_box;
     
     echo "<div id='msgbox'>";
-    $before_box = ob_get_clean(); // save html content before error box 
+       $before_box = ob_get_clean(); // save html content before error box 
 // Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
-       register_shutdown_function('ob_end_flush');
+       register_shutdown_function('end_flush');
     ob_start('output_html');
     echo "</div>";
 }
+/*
+       Helper to avoid sparse log notices.
+*/
+function end_flush () {
+               if (ob_get_level()) ob_end_flush();
+}
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {
        global $db, $debug;
+
+       $warning = $msg==null;
        $db_error = db_error_no();
        
-       $str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+//     $str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+       if($warning)
+               $str = "<b>" . _("Debug mode database warning:") . "</b><br>";
+       else
+               $str = "<b>" . _("DATABASE ERROR :") . "</b> $msg<br>";
        
        if ($db_error != 0) 
        {
@@ -99,9 +113,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
        }
        
        $str .= "<br><br>";
-
-       trigger_error($str, E_USER_ERROR);
-
+       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;
 }
@@ -127,8 +142,9 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
        if ($db_error != 0) 
        {
                
-               if (!frindly_db_error($db_error))
-                       display_db_error($msg, $sql_statement, false);
+               if (!frindly_db_error($db_error)) {
+                               display_db_error($msg, $sql_statement, false);
+               }
                
                if ($rollback_if_error) 
                {