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

server settings fixed and improved

Browse Source
This commit is contained in:
Steffen Schröder 2014-01-05 12:21:40 +01:00
parent 2b6a53c4d1
commit 2ed1041aed
1 changed files with 125 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
/** /**
* Constants * Constants
*/ */
const TITLE = 'Server Settings';
const ACTION_PREFIX_SETTING = 'ServerSettings.'; const ACTION_PREFIX_SETTING = 'ServerSettings.';
const ACTION_SETTING_BOOL = 'ServerSettings.ActionBoolSetting.'; const ACTION_SETTING_BOOL = 'ServerSettings.ActionBoolSetting.';
const CB_SERVERSETTING_CHANGED = 'ServerSettings.SettingChanged'; const CB_SERVERSETTING_CHANGED = 'ServerSettings.SettingChanged';
@ -41,14 +40,14 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
*/ */
public function __construct(ManiaControl $maniaControl) { public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl; $this->maniaControl = $maniaControl;
$this->initTables();
// Register for callbacks // Register for callbacks
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this,
'handleManialinkPageAnswer');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit');
$this->initTables();
} }
/** /**
* Initialize necessary database tables * Initialize necessary database tables
* *
@ -62,21 +61,17 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
`settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL, `settingValue` varchar(500) COLLATE utf8_unicode_ci NOT NULL,
UNIQUE KEY `setting` (`serverId`, `settingName`) UNIQUE KEY `setting` (`serverId`, `settingName`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Server Settings' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Server Settings' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if ($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;
} }
$statement->close(); $statement->close();
return true; return true;
} }
@ -95,33 +90,34 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
* @return bool * @return bool
*/ */
public function loadSettingsFromDatabase() { public function loadSettingsFromDatabase() {
$this->maniaControl->client->query('GetServerOptions');
$serverSettings = $this->maniaControl->client->getResponse();
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$loadedSettings = array();
$query = "SELECT * FROM `" . self::TABLE_SERVER_SETTINGS . "`;"; $query = "SELECT * FROM `" . self::TABLE_SERVER_SETTINGS . "`;";
$result = $mysqli->query($query); $result = $mysqli->query($query);
if(!$result) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false;
}
if ($result->num_rows <= 0) {
$result->close();
return true;
} }
$this->maniaControl->client->query('GetServerOptions');
$serverSettings = $this->maniaControl->client->getResponse();
$loadedSettings = array();
while ($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
if (!$serverSettings[$row->settingName]) continue;
$loadedSettings[$row->settingName] = $row->settingValue; $loadedSettings[$row->settingName] = $row->settingValue;
settype($loadedSettings[$row->settingName], gettype($serverSettings[$row->settingName])); settype($loadedSettings[$row->settingName], gettype($serverSettings[$row->settingName]));
} }
$result->close(); $result->close();
var_dump($loadedSettings);
$success = $this->maniaControl->client->query('SetServerOptions', $loadedSettings); $success = $this->maniaControl->client->query('SetServerOptions', $loadedSettings);
if (!$success) { if (!$success) {
$this->maniaControl->log('Error occurred: ' . $this->maniaControl->getClientErrorText()); trigger_error('Error occurred: ' . $this->maniaControl->getClientErrorText());
return false; return false;
} }
return true; return true;
} }
@ -130,7 +126,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
* @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle() * @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
*/ */
public function getTitle() { public function getTitle() {
return self::TITLE; return 'Server Settings';
} }
/** /**
@ -175,7 +171,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$script->addPageLabel($pageCountLabel, $pagesId); $script->addPageLabel($pageCountLabel, $pagesId);
// Setting pages // Setting pages
$pageFrames = array(); $pageFrames = array();
$y = 0.; $y = 0.;
@ -218,11 +213,11 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$substyle = ''; $substyle = '';
if ($value === false) { if ($value === false) {
$substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed; $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed;
} else if($value === true) { }
else if ($value === true) {
$substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen; $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen;
} }
$entry = new Entry(); $entry = new Entry();
$settingFrame->add($entry); $settingFrame->add($entry);
$entry->setStyle(Label_Text::STYLE_TextValueSmall); $entry->setStyle(Label_Text::STYLE_TextValueSmall);
@ -233,7 +228,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$entry->setName(self::ACTION_PREFIX_SETTING . $name); $entry->setName(self::ACTION_PREFIX_SETTING . $name);
$entry->setDefault($value); $entry->setDefault($value);
if($name == "Comment") { # if ($name == "Comment") { //
$entry->setAutoNewLine(true); $entry->setAutoNewLine(true);
$entry->setSize($width * 0.48, $settingHeight * 3 + $settingHeight * 0.9); $entry->setSize($width * 0.48, $settingHeight * 3 + $settingHeight * 0.9);
$settingFrame->setY($y - $settingHeight * 1.5); $settingFrame->setY($y - $settingHeight * 1.5);
@ -255,7 +250,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$entry->setVisible(false); $entry->setVisible(false);
} }
$y -= $settingHeight; $y -= $settingHeight;
if ($id % $pageMaxCount == $pageMaxCount - 1) { if ($id % $pageMaxCount == $pageMaxCount - 1) {
unset($pageFrame); unset($pageFrame);
@ -273,13 +267,11 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
*/ */
public function saveConfigData(array $configData, Player $player) { public function saveConfigData(array $configData, Player $player) {
// Note on ServerOptions the whole Options have to be saved, otherwise a error will appear // Note on ServerOptions the whole Options have to be saved, otherwise a error will appear
$this->maniaControl->client->query('GetServerOptions'); $this->maniaControl->client->query('GetServerOptions');
$serverSettings = $this->maniaControl->client->getResponse(); $serverSettings = $this->maniaControl->client->getResponse();
$prefixLength = strlen(self::ACTION_PREFIX_SETTING); $prefixLength = strlen(self::ACTION_PREFIX_SETTING);
$actionArray = explode(".", $configData[2]); $actionArray = explode(".", $configData[2]);
$boolSettingName = ''; $boolSettingName = '';
@ -326,7 +318,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$this->saveConfigData($callback[1], $player); $this->saveConfigData($callback[1], $player);
} }
/** /**
* Apply the Array of new Script Settings * Apply the Array of new Script Settings
* *
@ -344,7 +335,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
return false; return false;
} }
// Save Settings into Database // Save Settings into Database
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
@ -364,7 +354,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$serverId = $this->maniaControl->server->getServerId(); $serverId = $this->maniaControl->server->getServerId();
// Notifications // Notifications
$settingsCount = count($newSettings); $settingsCount = count($newSettings);
$settingIndex = 0; $settingIndex = 0;
@ -383,12 +372,13 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
// $chatMessage .= '$<' . '$fff' . preg_replace('/^S_/', '', $setting) . '$z$s$ff0 '; // $chatMessage .= '$<' . '$fff' . preg_replace('/^S_/', '', $setting) . '$z$s$ff0 ';
// $chatMessage .= 'to $fff' . $this->parseSettingValue($value) . '$>'; // $chatMessage .= 'to $fff' . $this->parseSettingValue($value) . '$>';
/*if ($settingIndex <= $settingsCount - 2) { /*
$chatMessage .= ', '; * if ($settingIndex <= $settingsCount - 2) { $chatMessage .= ', '; }
}*/ */
// Trigger own callback // Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_SERVERSETTING_CHANGED, array(self::CB_SERVERSETTING_CHANGED, $setting, $value)); $this->maniaControl->callbackManager->triggerCallback(self::CB_SERVERSETTING_CHANGED,
array(self::CB_SERVERSETTING_CHANGED, $setting, $value));
$settingIndex++; $settingIndex++;
} }