X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=53587df6ed081b1489e162d77898d474e48f3ed6;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=9b40fa9f887e4c08c2b25f758319463e59d0d12f;hpb=90b3d069d96b99671af51726e2953352738abb75;p=fa-stable.git

diff --git a/includes/errors.inc b/includes/errors.inc
index 9b40fa9f..53587df6 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -21,7 +21,8 @@ function get_backtrace($html = false, $skip=0)
 	foreach($trace as $trn => $tr) {
 		if ($trn <= $skip) continue;
 		if ($html) $str .= '<tr><td>';
-		$str .= $tr['file'].':'.$tr['line'].': ';
+		if (isset($tr['file']) && isset($tr['line']))
+			$str .= $tr['file'].':'.$tr['line'].': ';
 		if ($html) $str .= '</td><td>';
 		if (isset($tr['type'])) {
 	 		if($tr['type'] == '::') {
@@ -32,7 +33,7 @@ function get_backtrace($html = false, $skip=0)
 		}
 		$str .= $tr['function'].'(';
 		
-		if(is_array($tr['args'])) {
+		if(isset($tr['args']) && is_array($tr['args'])) {
 			$args = array();
 			foreach($tr['args'] as $n=>$a) {
 				if (is_object($tr['args'][$n]))
@@ -56,13 +57,14 @@ function get_backtrace($html = false, $skip=0)
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages, $go_debug, $SysPrefs;
+    global $messages, $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
+		'html_entity_decode', 				// nevermind encodings, special chars are processed anyway
+		'should be compatible with that',	// ignore cpdf/frontreport wrapper warnings
+		'mysql extension is deprecated'		// ignore strict warning in 5.4
 	);
 	foreach($excluded_warnings as $ref) {
 		if (strpos($errstr, $ref) !== false) {
@@ -70,15 +72,15 @@ function error_handler($errno, $errstr, $file, $line) {
 		}
 	}
 
-	if ($go_debug>1) {
-		$bt = get_backtrace(true, 1);
-	}
+	$bt = isset($SysPrefs) && $SysPrefs->go_debug>1 ? get_backtrace(true, 1) : array();
 
 	// error_reporting==0 when messages are set off with @ 
 	if ($errno & error_reporting()) {
-		$messages[] = array($errno, $errstr, $file, $line, @$bt);
+		// suppress duplicated errors
+		if (!in_array(array($errno, $errstr, $file, $line, @$bt), $messages))
+			$messages[] = array($errno, $errstr, $file, $line, @$bt);
 	}
-	else if($errno&~E_NOTICE) { // log all not displayed messages 
+	else if ($errno&~E_NOTICE && $errstr != '') { // 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");
@@ -86,52 +88,58 @@ function error_handler($errno, $errstr, $file, $line) {
 	
     return true;
 }
+
+function exception_handler($exception)
+{
+	error_handler(E_ERROR, sprintf(_("Unhandled exception [%s]: %s."), $exception->getCode(), $exception->getMessage()),
+		 $exception->getFile(), $exception->getLine());
+	end_page();
+}
 //------------------------------------------------------------------------------
 //	Formats system messages before insert them into message <div>
 // FIX center is unused now
 function fmt_errors($center=false) {
-    global $messages, $path_to_root, $go_debug;
-
-  $msg_class = array(
-  	E_USER_ERROR => 'err_msg',
-  	E_USER_WARNING =>'warn_msg', 
-	E_USER_NOTICE => 'note_msg');
-
-  $type = E_USER_NOTICE;
-  $content = '';
-//  $class = 'no_msg';
-  if (count($messages)) {
-	foreach($messages as $cnt=>$msg) {
-		if ($go_debug && $msg[0]>E_USER_NOTICE)
-		 	$msg[0] = E_ERROR;
-
-		if ($msg[0]>$type) continue;
-
-		if ($msg[0]<$type) { 
-			if ($msg[0] == E_USER_WARNING) {
-				$type = E_USER_WARNING; // user warnings 
-				$content = ''; 			// clean notices when we have errors
-			} else  {
-				$type = E_USER_ERROR; 	// php or user errors 
-				if($type == E_USER_WARNING)
-					$content = ''; 			// clean other messages
+    global $messages, $path_to_root, $SysPrefs;
+
+  	$msg_class = array(
+  		E_USER_ERROR => 'err_msg',
+  		E_USER_WARNING =>'warn_msg', 
+		E_USER_NOTICE => 'note_msg');
+
+  	$type = E_USER_NOTICE;
+  	$content = '';
+
+  	if (count($messages)) {
+		foreach($messages as $cnt=>$msg) {
+			if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE)
+		 		$msg[0] = E_ERROR;
+
+			if ($msg[0]>$type) continue;
+
+			if ($msg[0]<$type) { 
+				if ($msg[0] == E_USER_WARNING) {
+					$type = E_USER_WARNING; // user warnings 
+					$content = ''; 			// clean notices when we have errors
+				} else  {
+					$type = E_USER_ERROR; 	// php or user errors 
+					if($type == E_USER_WARNING)
+						$content = ''; 			// clean other messages
+				}
 			}
-		}
 
-	    $str = $msg[1];
-		if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
-		  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
+	    	$str = $msg[1];
+			if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
+		  		$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
 
-		if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
-		  $str .= '<br>'.$msg[4];
-		$content .= ($cnt ? '<hr>' : '').$str;
-	}
-	$class = $msg_class[$type];
-    $content = "<div class='$class'>$content</div>";
-  } else
-  if ($path_to_root=='.')
-	return '';
-  return $content;
+			if ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+		  		$str .= '<br>'.$msg[4];
+			$content .= ($cnt ? '<hr>' : '').$str;
+		}
+		$class = $msg_class[$type];
+    	$content = "<div class='$class'>$content</div>";
+  	} elseif ($path_to_root=='.')
+		return '';
+  	return $content;
 }
 //-----------------------------------------------------------------------------
 // Error box <div> element.
@@ -141,7 +149,7 @@ function error_box() {
     
     echo "<div id='msgbox'>";
 
-// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
+	// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
 	$before_box = ob_get_clean(); // save html content before error box 
     ob_start('output_html');
     echo "</div>";
@@ -167,12 +175,11 @@ function end_flush() {
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {
-	global $db, $debug, $go_debug, $db_connections;
+	global $db, $SysPrefs, $db_connections;
 
 	$warning = $msg==null;
 	$db_error = db_error_no();
 	
-//	$str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
 	if($warning)
 		$str = "<b>" . _("Debug mode database warning:") . "</b><br>";
 	else
@@ -184,29 +191,30 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
 		$str .= "error message : " . db_error_msg($db) . "<br>";
 	}
 	
-	if ($debug == 1) 
+	if ($SysPrefs->debug == 1) 
 	{
 		$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>";
-	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 (!$SysPrefs->go_debug)
+		error_log($str);
+	else {
+		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;
 }
 
 function frindly_db_error($db_error)
 {
-	global $db_duplicate_error_code;
-	
-	if ($db_error == $db_duplicate_error_code) 
-	{	
+	if ($db_error == DB_DUPLICATE_ERROR) 
+	{
 		display_error(_("The entered information is a duplicate. Please go back and enter different values."));
 		return true;
 	}
@@ -216,19 +224,19 @@ function frindly_db_error($db_error)
 
 function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
 {
-	global $db, $go_debug;
+	global $db, $SysPrefs;
 	$db_error = db_error_no();
 	
 	if ($db_error != 0) 
 	{
 		
-		if ($go_debug || !frindly_db_error($db_error)) {
-				display_db_error($msg, $sql_statement, false);
+		if ($SysPrefs->go_debug || !frindly_db_error($db_error)) {
+			display_db_error($msg, $sql_statement, false);
 		}
 		
 		if ($rollback_if_error) 
 		{
-		  $rollback_result = db_query("rollback");
+		  	$rollback_result = db_query("rollback");
 		}
 		
 		if ($exit_if_error) 
@@ -236,7 +244,6 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
 			end_page(); exit;
 		}
 	}
-	return $db_error;		
+	return $db_error;
 }
 
-?>
\ No newline at end of file