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

- adjustment for dedicated-api update

Browse Source 
- minor changes
This commit is contained in:
Steffen Schröder
2014-05-20 15:42:10 +02:00
parent 18cd71818a
commit 63981d8002
5 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Structures\ServerOptions;
use Maniaplanet\DedicatedServer\Xmlrpc\ServerOptionsException;
/**
@@ -107,15 +108,16 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
trigger_error($mysqli->error);
return false;
}
$serverSettings = $this->maniaControl->client->getServerOptions()->toArray();
$serverSettings = $this->maniaControl->client->getServerOptions();
$applySettings = false;
while ($row = $result->fetch_object()) {
if (!isset($serverSettings[$row->settingName])) {
$settingName = $row->settingName;
if (!property_exists($serverSettings, $settingName)) {
continue;
}
$oldType = gettype($serverSettings[$row->settingName]);
$serverSettings[$row->settingName] = $row->settingValue;
settype($serverSettings[$row->settingName], $oldType);
$oldType = gettype($serverSettings->$settingName);
$serverSettings->$settingName = $row->settingValue;
settype($serverSettings->$settingName, $oldType);
$applySettings = true;
}
$result->free();
@@ -278,24 +280,15 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
/**
* Apply the Array of new Server Settings
*
* @param array $newSettings
* @param Player $player
* @param ServerOptions $newSettings
* @param Player $player
* @return bool
*/
private function applyNewServerSettings(array $newSettings, Player $player) {
private function applyNewServerSettings(ServerOptions $newSettings, Player $player) {
if (!$newSettings) {
return true;
}
$rewriteSettings = array('NextUseChangingValidationSeed' => 'UseChangingValidationSeed');
foreach ($rewriteSettings as $oldName => $newName) {
if (array_key_exists($oldName, $newSettings)) {
$setting = $newSettings[$oldName];
unset($newSettings[$oldName]);
$newSettings[$newName] = $setting;
}
}
try {
$this->maniaControl->client->setServerOptions($newSettings);
} catch (ServerOptionsException $e) {
@@ -320,7 +313,8 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
return false;
}
foreach ($newSettings as $setting => $value) {
$settingsArray = $newSettings->toArray();
foreach ($settingsArray as $setting => $value) {
if ($value === null) {
continue;
}