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

- refactored many try-catch clauses

Browse Source 
- added todos for validating catching
This commit is contained in:
Steffen Schröder
2014-02-13 14:21:25 +01:00
parent 10dfd6b0cb
commit 4197dc82ff
23 changed files with 213 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,25 +100,22 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
return false;
}
$serverSettings = $this->maniaControl->client->getServerOptions()->toArray();
while($row = $result->fetch_object()) {
$applySettings = false;
while ($row = $result->fetch_object()) {
if (!isset($serverSettings[$row->settingName])) {
continue;
}
$oldType = gettype($serverSettings[$row->settingName]);
$serverSettings[$row->settingName] = $row->settingValue;
settype($serverSettings[$row->settingName], $oldType);
$applySettings = true;
}
$result->close();
if (!$serverSettings) {
if (!$applySettings) {
return true;
}
try {
$this->maniaControl->client->setServerOptions($serverSettings);
} catch(\Exception $e) {
trigger_error('Error occured: ' . $e->getMessage());
return false;
}
$this->maniaControl->client->setServerOptions($serverSettings);
return true;
}
@ -325,13 +322,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
if (!$newSettings) {
return true;
}
try {
$this->maniaControl->client->setServerOptions($newSettings);
} catch(\Exception $e) {
trigger_error('Error occured: ' . $e->getMessage());
return false;
}
$this->maniaControl->client->setServerOptions($newSettings);
// Save Settings into Database
$mysqli = $this->maniaControl->database->mysqli;