From 5f09a4ad3dae5797382390752df4d43d3c73cce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Fri, 2 May 2014 05:12:47 +0200
Subject: [PATCH] improved error handler

---
 application/core/ErrorHandler.php | 36 +++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/application/core/ErrorHandler.php b/application/core/ErrorHandler.php
index c2e5bbbe..54f56dec 100644
--- a/application/core/ErrorHandler.php
+++ b/application/core/ErrorHandler.php
@@ -110,23 +110,26 @@ class ErrorHandler {
 	 * @return bool
 	 */
 	public function errorHandler($errorNumber, $errorString, $errorFile = null, $errorLine = -1) {
-		if (error_reporting() == 0) {
+		if (error_reporting() === 0) {
 			// Error suppressed
 			return false;
 		}
 		
-		$userError = ($errorNumber == E_USER_ERROR || $errorNumber == E_USER_WARNING || $errorNumber == E_USER_NOTICE || $errorNumber == E_USER_DEPRECATED);
+		$userError = $this->isUserErrorNumber($errorNumber);
 		
 		// Log error
 		$errorTag = $this->getErrorTag($errorNumber);
 		$message = $errorTag . ': ' . $errorString;
+		$fileLine = $errorFile . ': ' . $errorLine;
 		$traceMessage = $this->parseBackTrace(debug_backtrace());
-		logMessage($message . ($userError ? '' : PHP_EOL . $traceMessage));
+		$logMessage = $message . PHP_EOL . ($userError ? $fileLine : $traceMessage);
+		logMessage($logMessage);
 		
 		if ($this->reportErrors && !$userError) {
 			$error = array();
 			$error["Type"] = "Error";
 			$error["Message"] = $message;
+			$error["FileLine"] = $fileLine;
 			$error["Backtrace"] = $traceMessage;
 			$error['OperatingSystem'] = php_uname();
 			$error['PHPVersion'] = phpversion();
@@ -140,7 +143,7 @@ class ErrorHandler {
 			
 			if ($this->maniaControl->settingManager && $this->maniaControl->updateManager) {
 				$error['UpdateChannel'] = $this->maniaControl->settingManager->getSetting($this->maniaControl->updateManager, UpdateManager::SETTING_UPDATECHECK_CHANNEL);
-				$error['ManiaControlVersion'] = $this->maniaControl->updateManager->getCurrentBuildDate();
+				$error['ManiaControlVersion'] = ManiaControl::VERSION . '#' . $this->maniaControl->updateManager->getNightlyBuildDate();
 			}
 			else {
 				$error['UpdateChannel'] = '';
@@ -160,14 +163,23 @@ class ErrorHandler {
 				logMessage("Error successfully reported!");
 			}
 		}
-		
-		if ($errorNumber == E_ERROR || $errorNumber == E_USER_ERROR || $errorNumber == E_FATAL) {
+		if ($this->shouldStopExecution($errorNumber)) {
 			logMessage('Stopping execution...');
 			exit();
 		}
 		return false;
 	}
 
+	/**
+	 * Check if the given Error Number is a User Error
+	 * 
+	 * @param int $errorNumber
+	 * @return bool
+	 */
+	private function isUserErrorNumber($errorNumber) {
+		return ($errorNumber === E_USER_ERROR || $errorNumber === E_USER_WARNING || $errorNumber === E_USER_NOTICE || $errorNumber === E_USER_DEPRECATED);
+	}
+
 	/**
 	 * Triggers a Debug Notice to the ManiaControl Website
 	 * 
@@ -178,7 +190,7 @@ class ErrorHandler {
 	}
 
 	/**
-	 * Get the prefix for the given error level
+	 * Get the Prefix for the given Error Level
 	 * 
 	 * @param int $errorLevel
 	 * @return string
@@ -217,6 +229,16 @@ class ErrorHandler {
 		return "[PHP {$errorLevel}]";
 	}
 
+	/**
+	 * Test if ManiaControl should stop its Execution
+	 * 
+	 * @param int $errorNumber
+	 * @return bool
+	 */
+	private function shouldStopExecution($errorNumber) {
+		return ($errorNumber === E_ERROR || $errorNumber === E_USER_ERROR || $errorNumber === E_FATAL);
+	}
+
 	/**
 	 * Test if ManiaControl should restart automatically
 	 *