beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
kremsy
2014-01-12 22:24:30 +01:00
committed by Steffen Schröder
parent b20c9517f8
commit eca7ec86ae
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/core/Configurators/ServerSettings.php
View File

@@ -90,9 +90,10 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
* @return bool
*/
public function loadSettingsFromDatabase() {
$mysqli = $this->maniaControl->database->mysqli;
$query = "SELECT * FROM `" . self::TABLE_SERVER_SETTINGS . "`;";
$result = $mysqli->query($query);
$serverId = $this->maniaControl->server->index;
$mysqli = $this->maniaControl->database->mysqli;
$query = "SELECT * FROM `" . self::TABLE_SERVER_SETTINGS . "` WHERE serverIndex = " . $serverId . ";";
$result = $mysqli->query($query);
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
@@ -109,8 +110,9 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
settype($loadedSettings[$row->settingName], gettype($serverSettings[$row->settingName]));
}
$result->close();
if(!$loadedSettings)
if(!$loadedSettings) {
return true;
}
$success = $this->maniaControl->client->query('SetServerOptions', $loadedSettings);
if(!$success) {
@@ -308,8 +310,9 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
public function handleManialinkPageAnswer(array $callback) {
$actionId = $callback[1][2];
$boolSetting = (strpos($actionId, self::ACTION_SETTING_BOOL) === 0);
if(!$boolSetting)
if(!$boolSetting) {
return;
}
$login = $callback[1][1];
$player = $this->maniaControl->playerManager->getPlayer($login);
@@ -326,8 +329,9 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
* @return bool
*/
private function applyNewScriptSettings(array $newSettings, Player $player) {
if(!$newSettings)
if(!$newSettings) {
return true;
}
$success = $this->maniaControl->client->query('SetServerOptions', $newSettings);
if(!$success) {
$this->maniaControl->chat->sendError('Error occurred: ' . $this->maniaControl->getClientErrorText(), $player->login);