X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=7654ba70e676320c24f1ea088bfc83293f97f814;hb=175a48c5bd73abe16e77fa2cb48ba522f00d1501;hp=1a39f1637ce3bffef74fbc61c28e42582ad843f8;hpb=89cb648e9d031fa624e7814f89e90ccba2042124;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 1a39f163..7654ba70 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,12 +17,30 @@ $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;
 
+	// 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',	// nevermind encodings, special chars are processed anyway
+		'should be compatible with that'			// ignore cpdf/frontreport wrapper warnings
+	);
+	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 
+		$user = @$_SESSION["wa_current_user"]->loginname;
+		$context = isset($SysPrefs) && !$SysPrefs->db_ok ? '[before upgrade]' : '';
+		error_log(user_company() . ":$user:". basename($file) .":$line:$context $errstr");
+	}
+	
     return true;
 }
 //------------------------------------------------------------------------------
@@ -38,7 +56,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 +77,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,16 +90,30 @@ 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;
+	global $db, $debug, $go_debug, $db_connections;
 
 	$warning = $msg==null;
 	$db_error = db_error_no();
@@ -101,7 +132,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
 	
 	if ($debug == 1) 
 	{
-		$str .= "sql that failed was : " . $sql_statement . "<br>";
+		$cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+
+		$str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."<br>";
+//		if ($go_debug > 1) display_backtrace();
 	}
 	
 	$str .= "<br><br>";
@@ -118,7 +152,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;
 	}
@@ -128,25 +162,24 @@ 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)) {
+		if ($go_debug || !frindly_db_error($db_error)) {
 				display_db_error($msg, $sql_statement, false);
 		}
 		
 		if ($rollback_if_error) 
 		{
-		  $rollback_result = db_query("rollback","could not rollback");			
+		  $rollback_result = db_query("rollback");
 		}
 		
 		if ($exit_if_error) 
 		{
-			echo "<br><br>";
-			exit;
+			end_page(); exit;
 		}
 	}
 	return $db_error;