From 41684c8b5940b814bcaf14b42eb3f4725eae72bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Sun, 5 Jan 2014 13:55:46 +0100 Subject: [PATCH] script settings: added check for script mode --- application/core/Configurators/ScriptSettings.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php index 89bdc80d..57afb5a0 100644 --- a/application/core/Configurators/ScriptSettings.php +++ b/application/core/Configurators/ScriptSettings.php @@ -92,6 +92,14 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { * @return bool */ public function loadSettingsFromDatabase() { + $this->maniaControl->client->query('GetModeScriptSettings'); + $scriptSettings = $this->maniaControl->client->getResponse(); + if (isset($scriptSettings['faultString'])) { + if ($scriptSettings['faultString'] == 'Not in script mode.') return false; + trigger_error('Error occured: ' . $scriptSettings['faultString']); + return false; + } + $mysqli = $this->maniaControl->database->mysqli; $query = "SELECT * FROM `" . self::TABLE_SCRIPT_SETTINGS . "`;"; $result = $mysqli->query($query); @@ -104,8 +112,6 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { return true; } - $this->maniaControl->client->query('GetModeScriptSettings'); - $scriptSettings = $this->maniaControl->client->getResponse(); $loadedSettings = array(); while ($row = $result->fetch_object()) { if (!isset($scriptSettings[$row->settingName])) continue;