X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=7654ba70e676320c24f1ea088bfc83293f97f814;hb=a963f2e4749169cd8f919db48cfdf5529aff5db9;hp=500d7e606ada7e1eb0020d996d1c39e313e2af74;hpb=8eacc919cc5fce2d2ddd69a650c33c881828c76d;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 500d7e60..7654ba70 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,23 +17,29 @@ $before_box = ''; // temporary container for output html data before error box
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages, $go_debug;
+    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');
+	$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 
-		error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':'
-			 . basename($file) .":$line: $errstr");
+	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;
 }
@@ -84,27 +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('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;
+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 (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();
@@ -123,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>";
@@ -162,7 +174,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
 		
 		if ($rollback_if_error) 
 		{
-		  $rollback_result = db_query("rollback","could not rollback");			
+		  $rollback_result = db_query("rollback");
 		}
 		
 		if ($exit_if_error)