script settings: added check for script mode

This commit is contained in:
Steffen Schröder 2014-01-05 13:55:46 +01:00
parent ccbe364221
commit 41684c8b59

View File

@ -92,6 +92,14 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
* @return bool * @return bool
*/ */
public function loadSettingsFromDatabase() { 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; $mysqli = $this->maniaControl->database->mysqli;
$query = "SELECT * FROM `" . self::TABLE_SCRIPT_SETTINGS . "`;"; $query = "SELECT * FROM `" . self::TABLE_SCRIPT_SETTINGS . "`;";
$result = $mysqli->query($query); $result = $mysqli->query($query);
@ -104,8 +112,6 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
return true; return true;
} }
$this->maniaControl->client->query('GetModeScriptSettings');
$scriptSettings = $this->maniaControl->client->getResponse();
$loadedSettings = array(); $loadedSettings = array();
while ($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
if (!isset($scriptSettings[$row->settingName])) continue; if (!isset($scriptSettings[$row->settingName])) continue;