Merged changes in main branch up to v.2.1.2

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

diff --git a/includes/errors.inc b/includes/errors.inc
index 9616313f433d91e8187d54eacf25d1c0ad45b467..160d41e5100dce8fe0d84bda8dd4d55b9c516f8f 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -1,60 +1,70 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $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'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
-    E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00'));
-
 //-----------------------------------------------------------------------------
 //    Error handler - collects all php/user messages for
 //    display in message box.
-// FIX: fatal errors ?
 
 function error_handler($errno, $errstr, $file, $line) {
     global $messages;
 
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting())
+       if ($errno & error_reporting()) {
                $messages[] = array($errno, $errstr, $file, $line);
-
+       }
     return true;
 }
 //------------------------------------------------------------------------------
 //     Formats system messages before insert them into message <div>
 // FIX center is unused now
-function fmt_errors($center=true) {
-    global $messages, $msg_colors;
+function fmt_errors($center=false) {
+    global $messages, $path_to_root;
   
+  $msg_class = array(
+       E_USER_ERROR => 'err_msg',
+       E_USER_WARNING =>'warn_msg', 
+       E_USER_NOTICE => 'note_msg');
+
   $type = E_USER_NOTICE;
-  
+  $content = '';
+  $class = 'no_msg';
   if (count($messages)) {
-       $content = '';
-       foreach($messages as $msg) {
+       foreach($messages as $cnt=>$msg) {
                if ($msg[0]>$type) continue;
-               if ($msg[0]<$type && $type>E_USER_ERROR) {
-                       $content = ''; // clean notices when we have errors
-                       $type = E_USER_ERROR; // php or user errors 
+
+               if ($msg[0]<$type) { 
+                       if ($msg[0] == E_USER_WARNING) {
+                               $type = E_USER_WARNING; // user warnings 
+                               $content = '';                  // clean notices when we have errors
+                       } else  {
+                               $type = E_USER_ERROR;   // php or user errors 
+                               if($type == E_USER_WARNING)
+                                       $content = '';                  // clean other messages
+                       }
                }
            $str = $msg[1];
-               $c = $msg_colors[$type];
-               if ($msg[0]<E_USER_ERROR && $msg[2]!=null)
+               if ($msg[0] < E_USER_ERROR && $msg[2] != null)
                  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
-               $content .= "<tr><td  " . ($center?"align='center' ":"").
-                 " width='100%' bgcolor='{$c['bg']}'><font color='{$c['txt']}'>"
-                 .$str."</font></td></tr>";
-       }
-
-       $str = "<center><table border='1' cellpadding='3' cellspacing='0' style='border-collapse: collapse' bordercolor='{$c['bd']}' width='98%'>"
-         . $content . "</table></center><br>\n";       
-               
-  }
-     else
-        $str = '';
-       
-    return $str;
+               $content .= ($cnt ? '<hr>' : '').$str;
+       }               
+       $class = $msg_class[$type];
+  } else
+   if ($path_to_root=='.')
+    return '';
+  
+  $content = "<div class='$class'>$content</div>";
+  return $content;
 }
 //-----------------------------------------------------------------------------
 // Error box <div> element.
@@ -65,6 +75,7 @@ function error_box() {
     echo "<div id='msgbox'>";
     $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');
     ob_start('output_html');
     echo "</div>";
 }
@@ -101,8 +112,7 @@ function frindly_db_error($db_error)
        
        if ($db_error == $db_duplicate_error_code) 
        {
-               display_error(_("The entered information is a duplicate. Please go back and enter different values.")
-               . "<br><a href='javascript:history.go(-1)'>" . _("Back") . "</a>", true);
+               display_error(_("The entered information is a duplicate. Please go back and enter different values."));
                return true;
        }