From 103baa82450e285dddc0da8f8258f08b112a99c9 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Wed, 14 Apr 2010 10:48:33 +0200
Subject: [PATCH] Error details of logstream sources will now be shown on
 detail page as well

---
 src/classes/logstreamdb.class.php  | 5 +++++
 src/classes/logstreampdo.class.php | 5 +++++
 src/details.php                    | 7 ++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php
index 418ae6a..e02323f 100644
--- a/src/classes/logstreamdb.class.php
+++ b/src/classes/logstreamdb.class.php
@@ -1363,6 +1363,8 @@ class LogStreamDB extends LogStream {
 	*/
 	private function PrintDebugError($szErrorMsg)
 	{
+		global $extraErrorDescription; 
+
 		$errdesc = mysql_error();
 		$errno = mysql_errno();
 
@@ -1370,6 +1372,9 @@ class LogStreamDB extends LogStream {
 		$errormsg.="Detail error: $errdesc <br>";
 		$errormsg.="Error Code: $errno <br>";
 		
+		// Add to additional error output
+		$extraErrorDescription = $errormsg;
+
 		//Output!
 		OutputDebugMessage("LogStreamDB|PrintDebugError: $errormsg", DEBUG_ERROR);
 	}
diff --git a/src/classes/logstreampdo.class.php b/src/classes/logstreampdo.class.php
index fe887bb..81457b3 100644
--- a/src/classes/logstreampdo.class.php
+++ b/src/classes/logstreampdo.class.php
@@ -1556,6 +1556,8 @@ class LogStreamPDO extends LogStream {
 	*/
 	private function PrintDebugError($szErrorMsg)
 	{
+		global $extraErrorDescription; 
+
 		$errdesc = $this->_dbhandle == null ? "" : implode( ";", $this->_dbhandle->errorInfo() );
 		$errno = $this->_dbhandle == null ? "" : $this->_dbhandle->errorCode();
 
@@ -1563,6 +1565,9 @@ class LogStreamPDO extends LogStream {
 		$errormsg.="Detail error: $errdesc <br>";
 		$errormsg.="Error Code: $errno <br>";
 
+		// Add to additional error output
+		$extraErrorDescription = $errormsg;
+
 		//Output!
 		OutputDebugMessage("LogStreamPDO|PrintDebugError: $errormsg", DEBUG_ERROR);
 	}
diff --git a/src/details.php b/src/details.php
index c51590e..be8674a 100644
--- a/src/details.php
+++ b/src/details.php
@@ -403,10 +403,11 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['uid_current'
 
 		if ( $ret == ERROR_UNDEFINED ) 
 			$content['detailederror'] = "Undefined error happened within the logstream.";
-//		else if ( $ret == ERROR_FILE_NOT_READABLE ) 
-//			$content['detailederror'] = "Syslog file is not readable, read access may be denied. ";
 		else 
-				$content['detailederror'] = "Unknown or unhandeled error occured.";
+			$content['detailederror'] = "Unknown or unhandeled error occured.";
+		// Add extra error stuff
+		if ( isset($extraErrorDescription) )
+			$content['detailederror'] .= "<br><br>" . GetAndReplaceLangStr( $content['LN_SOURCES_ERROR_EXTRAMSG'], $extraErrorDescription);
 
 		}
 	}