From 401310eecccca5bad2a8dc425ead5f778ebd01e0 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 10:51:24 +0100 Subject: [PATCH 01/14] test --- application/ManiaControl.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/ManiaControl.bat b/application/ManiaControl.bat index 1938a7d8..8c2e80ae 100644 --- a/application/ManiaControl.bat +++ b/application/ManiaControl.bat @@ -1,6 +1,6 @@ REM Set the path to your php.exe here -set phpPath="D:\Programme\xampp\php\php.exe" +set phpPath="D:\xampp\php\php.exe" REM Start ManiaControl START "" /B %phpPath% -f "ManiaControl.php" 2>&1 From 9cfa0b5e029bc8f7f8e4aa65923c6de460cc25a2 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 10:56:37 +0100 Subject: [PATCH 02/14] test --- application/ManiaControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/ManiaControl.php b/application/ManiaControl.php index 05f300d7..e952af9f 100644 --- a/application/ManiaControl.php +++ b/application/ManiaControl.php @@ -22,7 +22,7 @@ ini_set('error_log', 'logs/ManiaControl_' . getmypid() . '.log'); require_once __DIR__ . '/core/ManiaControl.php'; // Start ManiaControl -error_log('Loading ManiaControl v' . ManiaControl::VERSION . '...'); +serror_log('Loading ManiaControl v' . ManiaControl::VERSION . '...'); $maniaControl = new ManiaControl(); $maniaControl->run(); From 87785126845dbe590ddf55ae1c3bbe7751e3401d Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 10:58:17 +0100 Subject: [PATCH 03/14] testnack --- application/ManiaControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/ManiaControl.php b/application/ManiaControl.php index e952af9f..05f300d7 100644 --- a/application/ManiaControl.php +++ b/application/ManiaControl.php @@ -22,7 +22,7 @@ ini_set('error_log', 'logs/ManiaControl_' . getmypid() . '.log'); require_once __DIR__ . '/core/ManiaControl.php'; // Start ManiaControl -serror_log('Loading ManiaControl v' . ManiaControl::VERSION . '...'); +error_log('Loading ManiaControl v' . ManiaControl::VERSION . '...'); $maniaControl = new ManiaControl(); $maniaControl->run(); From df2422f48fa5d43fc29548a58aef14e694b9cd24 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:05:44 +0100 Subject: [PATCH 04/14] gittest1 --- application/core/ManiaControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index e7ea8ba0..46285078 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -129,7 +129,7 @@ class ManiaControl implements CommandListener { /** * Quit ManiaControl and log the given message - * + *test * @param string $message */ public function quit($message = false) { From 142a64f3c5a671643821942950ca64cecfa0f912 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:08:37 +0100 Subject: [PATCH 05/14] gittest1 --- application/core/ManiaControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index 46285078..e7ea8ba0 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -129,7 +129,7 @@ class ManiaControl implements CommandListener { /** * Quit ManiaControl and log the given message - *test + * * @param string $message */ public function quit($message = false) { From d82b29b48ae898bd076e23462691deedeb27232d Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:09:55 +0100 Subject: [PATCH 06/14] gittest1 --- application/core/ManiaControl.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index e7ea8ba0..a6ce4522 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -157,6 +157,7 @@ class ManiaControl implements CommandListener { /** * Run ManiaControl + * test */ public function run() { error_log('Starting ManiaControl v' . self::VERSION . '!'); From 308eac852a058296e53f5fb91fac7d942bdf39c0 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:10:44 +0100 Subject: [PATCH 07/14] testchanges back --- application/core/ManiaControl.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index a6ce4522..e7ea8ba0 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -157,7 +157,6 @@ class ManiaControl implements CommandListener { /** * Run ManiaControl - * test */ public function run() { error_log('Starting ManiaControl v' . self::VERSION . '!'); From 3be4ca39750b45053dd88b5d896810de92b7f8a4 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:17:38 +0100 Subject: [PATCH 08/14] gittest1 --- application/core/ManiaControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index e7ea8ba0..46285078 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -129,7 +129,7 @@ class ManiaControl implements CommandListener { /** * Quit ManiaControl and log the given message - * + *test * @param string $message */ public function quit($message = false) { From ab17db004b9442be74179a7225d81c211c89aeba Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:24:58 +0100 Subject: [PATCH 09/14] gittest1 --- application/core/Settings/SettingManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index b9708c3b..53282a3d 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -1,5 +1,5 @@ Date: Mon, 9 Dec 2013 11:25:30 +0100 Subject: [PATCH 10/14] gittest1 --- application/core/Settings/SettingManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index 53282a3d..b9708c3b 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -1,5 +1,5 @@ Date: Mon, 9 Dec 2013 11:28:04 +0100 Subject: [PATCH 11/14] gittest1 --- application/core/Settings/SettingManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index b9708c3b..c52d9ec7 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -4,7 +4,7 @@ namespace ManiaControl; /** * Class managing settings and configurations - * + *t * @author steeffeen & kremsy */ class SettingManager { From cb5a03568de01add8acc0ca931a3f247a4e1edd4 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:29:48 +0100 Subject: [PATCH 12/14] gittest1 --- application/core/Settings/SettingManager.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index c52d9ec7..55453c82 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -4,7 +4,7 @@ namespace ManiaControl; /** * Class managing settings and configurations - *t + * * @author steeffeen & kremsy */ class SettingManager { @@ -22,7 +22,6 @@ class SettingManager { * Private properties */ private $maniaControl = null; - private $configurator = null; private $arrayDelimiter = ';;'; /** From e89aed67685531b1f710623c10eaf3b903749fef Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:33:47 +0100 Subject: [PATCH 13/14] gittest1 --- application/core/Settings/SettingManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index 55453c82..3940209b 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -4,7 +4,7 @@ namespace ManiaControl; /** * Class managing settings and configurations - * + *t * @author steeffeen & kremsy */ class SettingManager { From b713a1d1425111bb80a988843e2605eafc3a3335 Mon Sep 17 00:00:00 2001 From: kremsy Date: Mon, 9 Dec 2013 11:34:02 +0100 Subject: [PATCH 14/14] gittest1 --- application/core/Settings/SettingManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index 3940209b..55453c82 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -4,7 +4,7 @@ namespace ManiaControl; /** * Class managing settings and configurations - *t + * * @author steeffeen & kremsy */ class SettingManager {