From dc56815f02d24d1263739d8b95f1919723584ca0 Mon Sep 17 00:00:00 2001 From: kremsy Date: Fri, 17 Jan 2014 17:09:25 +0100 Subject: [PATCH] cleanup scriptsettings --- .../core/Configurators/ScriptSettings.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php index 4cc9335d..e5533675 100644 --- a/application/core/Configurators/ScriptSettings.php +++ b/application/core/Configurators/ScriptSettings.php @@ -92,6 +92,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { */ public function loadSettingsFromDatabase() { $scriptSettings = (array)$this->maniaControl->client->getModeScriptSettings(); + if(isset($scriptSettings['faultString'])) { if($scriptSettings['faultString'] == 'Not in script mode.') { return false; @@ -99,6 +100,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { trigger_error('Error occured: ' . $scriptSettings['faultString']); return false; } + $mysqli = $this->maniaControl->database->mysqli; $serverId = $this->maniaControl->server->index; $query = "SELECT * FROM `" . self::TABLE_SCRIPT_SETTINGS . "` WHERE serverIndex = " . $serverId . ";"; @@ -146,17 +148,16 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { $frame = new Frame(); $scriptInfo = $this->maniaControl->client->getModeScriptInfo(); - //$scriptInfo = $this->maniaControl->client->execute('GetModeScriptInfo'); - //TODO: - /*if(isset($scriptInfo['faultCode'])) { - // Not in script mode - $label = new Label(); - $frame->add($label); - $label->setText($scriptInfo['faultString']); - return $frame; - } - $scriptParams = $scriptInfo['ParamDescs'];*/ + //TODO check error on not script modes, maybe exception happen, or dunno what, there is no faultString property? + /*if(isset($scriptInfo['faultCode'])) { + // Not in script mode + $label = new Label(); + $frame->add($label); + $label->setText($scriptInfo['faultString']); + return $frame; + } + */ $scriptParams = $scriptInfo->paramDescs;