[Web-erp-svn] SF.net SVN: web-erp:[5974] trunk/includes

[<te...@us...>]

Revision: 5974
          http://sourceforge.net/p/web-erp/reponame/5974
Author:   tehonu
Date:     2013-05-17 23:39:08 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Pak Ricard: Improve error reporting

Modified Paths:
--------------
    trunk/includes/ConnectDB_mysqli.inc
    trunk/includes/MiscFunctions.php

Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc	2013-05-17 23:15:37 UTC (rev 5973)
+++ trunk/includes/ConnectDB_mysqli.inc	2013-05-17 23:39:08 UTC (rev 5974)
@@ -80,7 +80,7 @@
 		if ($TrapErrors){
 			require_once($PathPrefix . 'includes/header.inc');
 		}
-		prnMsg($ErrorMessage.'<br />' . DB_error_msg($Conn),'error', _('Database Error'));
+		prnMsg($ErrorMessage.'<br />' . DB_error_msg($Conn),'error', _('Database Error'). ' ' .DB_error_no($Conn));
 		if ($debug==1){
 			prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
 		}
@@ -88,7 +88,9 @@
 			$SQL = 'rollback';
 			$Result = DB_query($SQL,$Conn);
 			if (DB_error_no($Conn) !=0){
-				prnMsg(_('Error Rolling Back Transaction'), '', _('Database Rollback Error') );
+				prnMsg(_('Error Rolling Back Transaction'), 'error', _('Database Rollback Error'). ' ' .DB_error_no($Conn) );
+			}else{
+				prnMsg(_('Rolling Back Transaction OK'), 'error', _('Database Rollback Due to Error Above'));
 			}
 		}
 		if ($TrapErrors){

Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php	2013-05-17 23:15:37 UTC (rev 5973)
+++ trunk/includes/MiscFunctions.php	2013-05-17 23:39:08 UTC (rev 5974)
@@ -28,21 +28,21 @@
 			$Class = 'error';
 			$Prefix = $Prefix ? $Prefix : _('ERROR') . ' ' ._('Message Report');
 			if (isset($_SESSION['LogSeverity']) and $_SESSION['LogSeverity']>0) {
-				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim($Msg,',')."\n");
+				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim(str_replace("<br />", " ", $Msg),',')."\n");
 			}
 			break;
 		case 'warn':
 			$Class = 'warn';
 			$Prefix = $Prefix ? $Prefix : _('WARNING') . ' ' . _('Message Report');
 			if (isset($_SESSION['LogSeverity']) and $_SESSION['LogSeverity']>1) {
-				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim($Msg,',')."\n");
+				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim(str_replace("<br />", " ", $Msg),',')."\n");
 			}
 			break;
 		case 'success':
 			$Class = 'success';
 			$Prefix = $Prefix ? $Prefix : _('SUCCESS') . ' ' . _('Report');
 			if (isset($_SESSION['LogSeverity']) and $_SESSION['LogSeverity']>3) {
-				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim($Msg,',')."\n");
+				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim(str_replace("<br />", " ", $Msg),',')."\n");
 			}
 			break;
 		case 'info':
@@ -50,7 +50,7 @@
 			$Prefix = $Prefix ? $Prefix : _('INFORMATION') . ' ' ._('Message');
 			$Class = 'info';
 			if (isset($_SESSION['LogSeverity']) and $_SESSION['LogSeverity']>2) {
-				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim($Msg,',')."\n");
+				fwrite($LogFile, date('Y-m-d H:i:s').','.$Type.','.$_SESSION['UserID'].','.trim(str_replace("<br />", " ", $Msg),',')."\n");
 			}
 	}
 	return '<div class="'.$Class.'"><b>' . $Prefix . '</b> : ' .$Msg . '</div>';