X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=9e0dba2e87fc99edf3694e96528e6096e74c31b3;hb=fea32048f1b2874f75b7f15af5f2d9667163a4d8;hp=160d41e5100dce8fe0d84bda8dd4d55b9c516f8f;hpb=c6f1621249a53faada39629a9ba958a6a5837262;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 160d41e5..9e0dba2e 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,12 +17,25 @@ $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, $SysPrefs;
 
-	// error_reporting==0 when messages are set off with @ 
-	if ($errno & error_reporting()) {
-		$messages[] = array($errno, $errstr, $file, $line);
+	// 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');
+	foreach($excluded_warnings as $ref) {
+		if (strpos($errstr, $ref) !== false) {
+			return true;
+		}
 	}
+
+	// error_reporting==0 when messages are set off with @ 
+	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:" . ( $SysPrefs->db_ok ? '':'[before upgrade]')
+			 . " $errstr");
+	
     return true;
 }
 //------------------------------------------------------------------------------
@@ -38,7 +51,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 +72,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 +85,39 @@ function error_box() {
     global $before_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');
+	$before_box = ob_get_clean(); // save html content before error box 
     ob_start('output_html');
     echo "</div>";
 }
+/*
+	Helper to avoid sparse log notices.
+*/
+function end_flush() {
+	global $Ajax, $transaction_level;
+
+	if (isset($Ajax))
+		$Ajax->run();
+	// flush all output buffers (works also with exit inside any div levels)
+	while(ob_get_level()) ob_end_flush();
+
+	// if any transaction was aborted unexpectedly rollback changes
+	cancel_transaction();
+}
 
 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 +131,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;
 }
@@ -111,7 +144,7 @@ function frindly_db_error($db_error)
 	global $db_duplicate_error_code;
 	
 	if ($db_error == $db_duplicate_error_code) 
-	{
+	{	
 		display_error(_("The entered information is a duplicate. Please go back and enter different values."));
 		return true;
 	}
@@ -121,14 +154,15 @@ function frindly_db_error($db_error)
 
 function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
 {
-	global $db;
+	global $db, $go_debug;
 	$db_error = db_error_no();
 	
 	if ($db_error != 0) 
 	{
 		
-		if (!frindly_db_error($db_error))
-			display_db_error($msg, $sql_statement, false);
+		if ($go_debug || !frindly_db_error($db_error)) {
+				display_db_error($msg, $sql_statement, false);
+		}
 		
 		if ($rollback_if_error) 
 		{
@@ -137,8 +171,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
 		
 		if ($exit_if_error) 
 		{
-			echo "<br><br>";
-			exit;
+			end_page(); exit;
 		}
 	}
 	return $db_error;