X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=bfa213d5514d96ab1ac59e87e22fa8ffcc2619ba;hb=628583995e3be96a346a9c078a41cf5ee0eab238;hp=1c0f2f97e9108209678d7bd4380afb9c420356f8;hpb=ce2a1cae35df4f60c3b993d79cb9eb65cb2cb82e;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 1c0f2f97..bfa213d5 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,12 +17,24 @@ $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);
+	// 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: $errstr");
+	
     return true;
 }
 //------------------------------------------------------------------------------
@@ -72,12 +84,18 @@ 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)
 {
@@ -144,8 +162,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;