From 5c8160bec063148570a904b3357290d3ca79b084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Sun, 10 Nov 2013 13:46:44 +0100
Subject: [PATCH] - improved chat utility - removed chat config file

---
 application/configs/chat.xml | 12 ------
 application/core/chat.php    | 76 ++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 42 deletions(-)
 delete mode 100644 application/configs/chat.xml

diff --git a/application/configs/chat.xml b/application/configs/chat.xml
deleted file mode 100644
index 7f4c556a..00000000
--- a/application/configs/chat.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Configure how ManiaControl sends chat message -->
-<chat-config>
-
-	<!-- Set which codes should be used to compose chat messages -->
-	<messages>
-		<information>$fff</information>
-		<success>$0f0</success>
-		<error>$f00</error>
-	</messages>
-
-</chat-config>
diff --git a/application/core/chat.php b/application/core/chat.php
index 4b9ebde9..7042c504 100644
--- a/application/core/chat.php
+++ b/application/core/chat.php
@@ -3,58 +3,72 @@
 namespace ManiaControl;
 
 /**
- * Class for chat methods
+ * Chat utility class
  *
- * @author steeffeen
+ * @author steeffeen & kremsy
  */
 class Chat {
-
+	
 	/**
 	 * Private properties
 	 */
-	private $mc = null;
-
-	private $config = null;
-
-	private $prefix = 'ManiaControl>';
+	private $maniaControl = null;
 
 	/**
-	 * Construct ManiaControl chat
+	 * Construct chat utility
+	 *
+	 * @param ManiaControl $maniaControl        	
 	 */
-	public function __construct($mc) {
-		$this->mc = $mc;
-		
-		// Load config
-		$this->config = Tools::loadConfig('chat.xml');
+	public function __construct(ManiaControl $maniaControl) {
+		$this->maniaControl = $maniaControl;
+	}
+
+	/**
+	 * Get prefix
+	 *
+	 * @param string|bool $prefix        	
+	 * @return string
+	 */
+	private function getPrefix($prefix) {
+		if (is_string($prefix)) {
+			return $prefix;
+		}
+		if ($prefix === true) {
+			return $this->maniaControl->settingManager->getSetting($this, 'DefaultPrefix', 'ManiaControl>');
+		}
+		return '';
 	}
 
 	/**
 	 * Send a chat message to the given login
 	 *
-	 * @param string $login        	
 	 * @param string $message        	
-	 * @param bool $prefix        	
+	 * @param string $login        	
+	 * @param string|bool $prefix        	
+	 * @return bool
 	 */
 	public function sendChat($message, $login = null, $prefix = false) {
-		if (!$this->mc->client) return false;
+		if (!$this->maniaControl->client) {
+			return false;
+		}
+		$client = $this->maniaControl->client;
+		$chatMessage = '$z' . $this->getPrefix($prefix) . $message . '$z';
 		if ($login === null) {
-			return $this->mc->client->query('ChatSendServerMessage', '$z' . ($prefix ? $this->prefix : '') . $message . '$z');
-		}
-		else {
-			return $this->mc->client->query('ChatSendServerMessageToLogin', '$z' . ($prefix ? $this->prefix : '') . $message . '$z', 
-					$login);
+			return $client->query('ChatSendServerMessage', $chatMessage);
 		}
+		return $client->query('ChatSendServerMessageToLogin', $chatMessage, $login);
 	}
 
 	/**
 	 * Send an information message to the given login
 	 *
-	 * @param string $login        	
 	 * @param string $message        	
-	 * @param bool $prefix        	
+	 * @param string $login        	
+	 * @param string|bool $prefix        	
+	 * @return bool
 	 */
 	public function sendInformation($message, $login = null, $prefix = false) {
-		$format = (string) $this->config->messages->information;
+		$format = $this->maniaControl->settingManager->getSetting($this, 'ErrorFormat', '$fff');
 		return $this->sendChat($format . $message, $login);
 	}
 
@@ -63,22 +77,24 @@ class Chat {
 	 *
 	 * @param string $message        	
 	 * @param string $login        	
-	 * @param bool $prefix        	
+	 * @param string|bool $prefix        	
+	 * @return bool
 	 */
 	public function sendSuccess($message, $login = null, $prefix = false) {
-		$format = (string) $this->config->messages->success;
+		$format = $this->maniaControl->settingManager->getSetting($this, 'ErrorFormat', '$0f0');
 		return $this->sendChat($format . $message, $login);
 	}
 
 	/**
 	 * Send an error message to the given login
 	 *
-	 * @param string $login        	
 	 * @param string $message        	
-	 * @param bool $prefix        	
+	 * @param string $login        	
+	 * @param string|bool $prefix        	
+	 * @return bool
 	 */
 	public function sendError($message, $login = null, $prefix = false) {
-		$format = (string) $this->config->messages->error;
+		$format = $this->maniaControl->settingManager->getSetting($this, 'ErrorFormat', '$f00');
 		return $this->sendChat($format . $message, $login);
 	}
 }