X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=8972a9eb4b2fbe0de4fe348528acfd8153ffb2b8;hb=c4eae7a18f0eb824e6eda7be2ba6fa820e9e58c9;hp=9616313f433d91e8187d54eacf25d1c0ad45b467;hpb=f6e1b649fc75750383b17c2ced6a5c1d6f19fe2e;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 9616313f..8972a9eb 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -1,25 +1,33 @@
 <?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_WARNING => array('bg'=>'#ffff00', 'txt'=>'#ff5500', 'bd'=>'#ff9900'),
     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;
 }
 //------------------------------------------------------------------------------
@@ -34,14 +42,22 @@ function fmt_errors($center=true) {
 	$content = '';
 	foreach($messages as $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>";
@@ -65,6 +81,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 +118,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;
 	}