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

42
application/core/Configurators/ScriptSettings.php
View File

@ -14,6 +14,7 @@ use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Maps\MapManager;
use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
/**
* Class offering a Configurator for Script Settings
@ -109,8 +110,11 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
public function loadSettingsFromDatabase() {
try {
$scriptSettings = $this->maniaControl->client->getModeScriptSettings();
} catch(\Exception $e) {
return false;
} catch(Exception $e) {
if ($e->getMessage() == 'Not in script mode.') {
return false;
}
throw $e;
}
$mysqli = $this->maniaControl->database->mysqli;
@ -137,7 +141,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
try {
$this->maniaControl->client->setModeScriptSettings($loadedSettings);
} catch(\Exception $e) {
} catch(Exception $e) {
trigger_error('Error occured: ' . $e->getMessage());
return false;
}
@ -160,19 +164,21 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
try {
$scriptInfo = $this->maniaControl->client->getModeScriptInfo();
} catch(\Exception $e) {
// Not in script mode
$label = new Label();
$frame->add($label);
$label->setText($e->getMessage());
return $frame;
} catch(Exception $e) {
if ($e->getMessage() == 'Not in script mode.') {
$label = new Label();
$frame->add($label);
$label->setText($e->getMessage());
return $frame;
}
throw $e;
}
$scriptParams = $scriptInfo->paramDescs;
try {
$scriptSettings = $this->maniaControl->client->getModeScriptSettings();
} catch(\Exception $e) {
} catch(Exception $e) {
//do nothing
}
@ -303,8 +309,11 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
try {
$scriptSettings = $this->maniaControl->client->getModeScriptSettings();
} catch(\Exception $e) {
return;
} catch(Exception $e) {
if ($e->getMessage() == 'Not in script mode.') {
return;
}
throw $e;
}
$prefixLength = strlen(self::ACTION_PREFIX_SETTING);
@ -369,8 +378,11 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
public function toggleBooleanSetting($setting, Player $player) {
try {
$scriptSettings = $this->maniaControl->client->getModeScriptSettings();
} catch(\Exception $e) {
return;
} catch(Exception $e) {
if ($e->getMessage() == 'Not in script mode.') {
return;
}
throw $e;
}
if (!isset($scriptSettings[$setting])) {
@ -398,7 +410,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
try {
$this->maniaControl->client->setModeScriptSettings($newSettings);
} catch(\Exception $e) {
} catch(Exception $e) {
$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
return false;
}

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;