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

renamed server config class

Browse Source 
improved loading code
This commit is contained in:
Steffen Schröder 2014-05-27 10:46:18 +02:00
parent f54ee6df64
commit eead92e0dd
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/core/Server/Server.php
View File

@ -26,7 +26,7 @@ class Server implements CallbackListener {
/*
* Public Properties
*/
/** @var Config $config */
/** @var ServerConfig $config */
public $config = null;
public $index = -1;
public $ip = null;
@ -117,35 +117,35 @@ class Server implements CallbackListener {
// Host
$hostElements = $serverElement->xpath('host');
if (!$hostElements) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
trigger_error("Invalid server configuration (Host).", E_USER_ERROR);
}
$host = (string)$hostElements[0];
// Port
$portElements = $serverElement->xpath('port');
if (!$portElements) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
trigger_error("Invalid server configuration (Port).", E_USER_ERROR);
}
$port = (string)$portElements[0];
// Login
$loginElements = $serverElement->xpath('login');
if (!$loginElements) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
trigger_error("Invalid server configuration (Login).", E_USER_ERROR);
}
$login = (string)$loginElements[0];
// Password
$passElements = $serverElement->xpath('pass');
if (!$passElements) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
trigger_error("Invalid server configuration (Pass).", E_USER_ERROR);
}
$pass = (string)$passElements[0];
// Create config object
$config = new Config($serverId, $host, $port, $login, $pass);
$config = new ServerConfig($serverId, $host, $port, $login, $pass);
if (!$config->validate()) {
$this->maniaControl->quit("Your Configuration File doesn't seem to be maintained properly. Please check it again!", true);
$this->maniaControl->quit("Your config file doesn't seem to be maintained properly. Please check the server configuration again!", true);
}
$this->config = $config;
}

11
application/core/Server/Config.php → application/core/Server/ServerConfig.php
View File

@ -9,7 +9,7 @@ namespace ManiaControl\Server;
* @copyright 2014 ManiaControl Team
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
*/
class Config {
class ServerConfig {
/*
* Public Properties
*/
@ -42,13 +42,10 @@ class Config {
* @return bool
*/
public function validate() {
$invalid = false;
if (!$this->host) {
$invalid = true;
} else if (!$this->port || $this->port === 'port') {
$invalid = true;
if (!$this->host || !$this->port || !$this->login || !$this->pass) {
return false;
}
if ($invalid) {
if ($this->port === 'port') {
return false;
}
return true;