X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=1c0f2f97e9108209678d7bd4380afb9c420356f8;hb=0917891be384286611592f13872cc9437826ce09;hp=160d41e5100dce8fe0d84bda8dd4d55b9c516f8f;hpb=c6f1621249a53faada39629a9ba958a6a5837262;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 160d41e5..1c0f2f97 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -38,7 +38,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 +59,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;
 }
 //-----------------------------------------------------------------------------
@@ -83,9 +82,15 @@ function error_box() {
 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 +104,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 +133,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) 
 		{