- renamed ManiaControl start script

- setting manager prototype

application/ManiaControl.bat

@@ -3,4 +3,4 @@ REM Set the path to your php.exe here
 set phpPath="D:\Programme\xampp\php\php.exe"
 
 REM Start ManiaControl
-START "" /B %phpPath% -f "startManiaControl.php" 2>&1
+START "" /B %phpPath% -f "ManiaControl.php" 2>&1

application/ManiaControl.php

@@ -1,6 +1,6 @@
 <?php
-
 use ManiaControl\ManiaControl;
+
 // Define base dir
 define('ManiaControlDir', __DIR__);
 
@@ -16,7 +16,7 @@ ini_set('error_reporting', -1);
 ini_set('error_log', 'ManiaControl_' . getmypid() . '.log');
 
 // Load ManiaControl class
-require_once __DIR__ . '/core/maniaControl.php';
+require_once __DIR__ . '/core/maniaControlClass.php';
 
 // Start ManiaControl
 error_log('Loading ManiaControl v' . ManiaControl::VERSION . '...');

application/ManiaControl.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-php startManiaControl.php 2>&1 &
+php ManiaControl.php 2>&1 &
 echo $! > ManiaControl.pid

application/core/maniaControlClass.php

@@ -10,11 +10,12 @@ require_once __DIR__ . '/callbacks.php';
 require_once __DIR__ . '/chat.php';
 require_once __DIR__ . '/commands.php';
 require_once __DIR__ . '/database.php';
-require_once __DIR__ . '/server.php';
-require_once __DIR__ . '/tools.php';
-require_once __DIR__ . '/pluginHandler.php';
-require_once __DIR__ . '/playerHandler.php';
 require_once __DIR__ . '/manialinkIdHandler.php';
+require_once __DIR__ . '/playerHandler.php';
+require_once __DIR__ . '/pluginHandler.php';
+require_once __DIR__ . '/server.php';
+require_once __DIR__ . '/settingManager.php';
+require_once __DIR__ . '/tools.php';
 list($endiantest) = array_values(unpack('L1L', pack('V', 1)));
 if ($endiantest == 1) {
 	require_once __DIR__ . '/PhpRemote/GbxRemote.inc.php';
@@ -41,13 +42,14 @@ class ManiaControl {
 	 */
 	public $authentication = null;
 	public $callbacks = null;
-	public $client = null;
 	public $chat = null;
+	public $client = null;
 	public $commands = null;
 	public $database = null;
-	public $server = null;
 	public $manialinkIdHandler = null;
 	public $pluginHandler = null;
+	public $server = null;
+	public $settingManager = null;
 	
 	/**
 	 * Private properties
@@ -60,9 +62,10 @@ class ManiaControl {
 	 */
 	public function __construct() {
 		$this->config = Tools::loadConfig('core.xml');
+		$this->database = new Database($this);
+		$this->settingManager = new SettingManager($this);
 		$this->chat = new Chat($this);
 		$this->callbacks = new Callbacks($this);
-		$this->database = new Database($this);
 		$this->server = new Server($this);
 		$this->authentication = new Authentication($this);
 		$this->playerHandler = new PlayerHandler($this);

application/core/settingManager.php

@@ -0,0 +1,198 @@
+<?php
+
+namespace ManiaControl;
+
+/**
+ * Class managing settings and configurations
+ *
+ * @author steeffeen & kremsy
+ */
+class SettingManager {
+	/**
+	 * Constants
+	 */
+	const TABLE_SETTINGS = 'mc_settings';
+	
+	/**
+	 * Private properties
+	 */
+	private $maniaControl = null;
+
+	/**
+	 * Construct setting manager
+	 *
+	 * @param ManiaControl $maniaControl        	
+	 */
+	public function __construct(ManiaControl $maniaControl) {
+		$this->maniaControl = $maniaControl;
+		
+		$this->initTables();
+	}
+
+	/**
+	 * Initialize necessary database tables
+	 *
+	 * @return bool
+	 */
+	private function initTables() {
+		$mysqli = $this->maniaControl->database->mysqli;
+		$settingTableQuery = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SETTINGS . "` (
+				`index` int(11) NOT NULL AUTO_INCREMENT,
+				`class` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+				`setting` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+				`type` set('string','int','real','bool') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'string',
+				`value` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+				`default` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+				`changed` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+				PRIMARY KEY (`index`),
+				UNIQUE KEY `settingId` (`class`,`setting`)
+				) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Settings and Configurations' AUTO_INCREMENT=1;";
+		$settingTableStatement = $mysqli->prepare($settingTableQuery);
+		if ($mysqli->error) {
+			trigger_error($mysqli->error, E_USER_ERROR);
+			return false;
+		}
+		$settingTableStatement->execute();
+		if ($settingTableStatement->error) {
+			trigger_error($settingTableStatement->error, E_USER_ERROR);
+			return false;
+		}
+		$settingTableStatement->close();
+		return true;
+	}
+
+	/**
+	 * Get type for given parameter
+	 *
+	 * @param mixed $param        	
+	 * @return string
+	 */
+	private function getType($param) {
+		if (is_int($param)) {
+			return 'int';
+		}
+		if (is_real($param)) {
+			return 'real';
+		}
+		if (is_bool($param)) {
+			return 'bool';
+		}
+		if (is_string($param)) {
+			return 'string';
+		}
+		trigger_error('Unsupported setting type. ' . print_r($param, true));
+		return null;
+	}
+
+	/**
+	 * Cast a setting to the given type
+	 *
+	 * @param string $type        	
+	 * @param mixed $value        	
+	 * @return mixed
+	 */
+	private function castSetting($type, $value) {
+		$type = strtolower($type);
+		if ($type === 'int') {
+			return (int) $value;
+		}
+		if ($type === 'real') {
+			return (real) $value;
+		}
+		if ($type === 'bool') {
+			return (bool) $value;
+		}
+		if ($type === 'string') {
+			return (string) $value;
+		}
+		trigger_error('Unsupported setting type. ' . print_r($param, true));
+		return $value;
+	}
+
+	/**
+	 * Initialize a setting for given object
+	 *
+	 * @param object $object        	
+	 * @param string $settingName        	
+	 * @param mixed $default        	
+	 * @return bool
+	 */
+	public function initSetting($object, $settingName, $default) {
+		if ($default === null || is_object($default)) {
+			return false;
+		}
+		$className = $object;
+		if (is_object($object)) {
+			$className = get_class($object);
+		}
+		$type = $this->getType($default);
+		$mysqli = $this->maniaControl->database->mysqli;
+		$settingQuery = "INSERT INTO `" . self::TABLE_SETTINGS . "` (
+				`class`,
+				`setting`,
+				`type`,
+				`value`,
+				`default`
+				) VALUES (
+				?, ?, ?,
+				@value := ?,
+				@value
+				);";
+		$settingStatement = $mysqli->prepare($settingQuery);
+		if ($mysqli->error) {
+			trigger_error($mysqli->error);
+			return false;
+		}
+		$settingStatement->bind_param('ssss', $className, $settingName, $type, $default);
+		$settingStatement->execute();
+		if ($settingStatement->error) {
+			trigger_error($settingStatement->error);
+			return false;
+		}
+		$settingStatement->close();
+		return true;
+	}
+
+	/**
+	 * Get setting by name for given object
+	 *
+	 * @param object $object        	
+	 * @param string $settingName        	
+	 * @param mixed $default        	
+	 * @return mixed
+	 */
+	public function getSetting($object, $settingName, $default = null) {
+		$className = $object;
+		if (is_object($object)) {
+			$className = get_class($object);
+		}
+		$mysqli = $this->maniaControl->database->mysqli;
+		$settingQuery = "SELECT `type`, `value` FROM `" . self::TABLE_SETTINGS . "`
+				WHERE `class` = ?
+				AND `setting` = ?;";
+		$settingStatement = $mysqli->prepare($settingQuery);
+		if ($mysqli->error) {
+			trigger_error($mysqli->error);
+			return null;
+		}
+		$settingStatement->bind_param('ss', $className, $settingName);
+		$settingStatement->execute();
+		if ($settingStatement->error) {
+			trigger_error($settingStatement->error);
+			return null;
+		}
+		$settingStatement->store_result();
+		if ($settingStatement->num_rows <= 0) {
+			$this->initSetting($object, $settingName, $default);
+			return $default;
+		}
+		$settingStatement->bind_result($type, $value);
+		$settingStatement->fetch();
+		$settingStatement->free_result();
+		$settingStatement->close();
+		$setting = $this->castSetting($type, $value);
+		return $setting;
+	}
+}
+
+?>