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

use command line helper

Browse Source
This commit is contained in:
Steffen Schröder 2014-05-01 20:20:29 +02:00
parent 01a6b37c6d
commit 0f4281f415
1 changed files with 108 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use ManiaControl\CommandLineHelper;
/** /**
* Class providing Access to the connected ManiaPlanet Server * Class providing Access to the connected ManiaPlanet Server
@ -24,7 +25,10 @@ class Server implements CallbackListener {
/* /*
* Public Properties * Public Properties
*/ */
/** @var Config $config */ /**
*
* @var Config $config
*/
public $config = null; public $config = null;
public $index = -1; public $index = -1;
public $ip = null; public $ip = null;
@ -64,69 +68,68 @@ class Server implements CallbackListener {
* Load the Server Configuration from the Config XML * Load the Server Configuration from the Config XML
*/ */
public function loadConfig() { public function loadConfig() {
if (!$this->maniaControl->config) { // Server id parameter
trigger_error('Error loading Server Config!', E_USER_ERROR); $serverId = CommandLineHelper::getParameter('-id');
}
// Config id
$id = null;
global $argv;
foreach($argv as $arg) {
$parts = explode('=', $arg);
if (count($parts) < 2)
continue;
if ($parts[0] != '-id')
continue;
$id = $parts[1];
break;
}
// Xml server tag with given id // Xml server tag with given id
$serverTag = null; $serverTag = null;
if ($id) { if ($serverId) {
$serverTags = $this->maniaControl->config->xpath("server[@id='{$id}']"); $serverTags = $this->maniaControl->config->xpath("server[@id='{$serverId}']");
if ($serverTags) if ($serverTags) {
$serverTag = $serverTags[0]; $serverTag = $serverTags[0];
if (!$serverTag) }
trigger_error("No Server configured with the ID '{$id}'!", E_USER_ERROR); if (!$serverTag) {
} else { trigger_error("No Server configured with the ID '{$serverId}'!", E_USER_ERROR);
}
}
else {
$serverTags = $this->maniaControl->config->xpath('server'); $serverTags = $this->maniaControl->config->xpath('server');
if ($serverTags) if ($serverTags) {
$serverTag = $serverTags[0]; $serverTag = $serverTags[0];
if (!$serverTag) }
if (!$serverTag) {
trigger_error('No Server configured!', E_USER_ERROR); trigger_error('No Server configured!', E_USER_ERROR);
} }
}
// Host // Host
$host = $serverTag->xpath('host'); $host = $serverTag->xpath('host');
if ($host) if ($host) {
$host = (string) $host[0]; $host = (string) $host[0];
if (!$host) }
if (!$host) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR); trigger_error("Invalid server configuration (host).", E_USER_ERROR);
}
// Port // Port
$port = $serverTag->xpath('port'); $port = $serverTag->xpath('port');
if ($port) if ($port) {
$port = (string) $port[0]; $port = (string) $port[0];
if (!$port) }
if (!$port) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR); trigger_error("Invalid server configuration (port).", E_USER_ERROR);
}
// Login // Login
$login = $serverTag->xpath('login'); $login = $serverTag->xpath('login');
if ($login) if ($login) {
$login = (string) $login[0]; $login = (string) $login[0];
if (!$login) }
if (!$login) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR); trigger_error("Invalid server configuration (login).", E_USER_ERROR);
}
// Pass // Password
$pass = $serverTag->xpath('pass'); $pass = $serverTag->xpath('pass');
if ($pass) if ($pass) {
$pass = (string) $pass[0]; $pass = (string) $pass[0];
if (!$pass) }
if (!$pass) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR); trigger_error("Invalid server configuration (password).", E_USER_ERROR);
}
// Create config object // Create config object
$this->config = new Config($id, $host, $port, $login, $pass); $this->config = new Config($serverId, $host, $port, $login, $pass);
} }
/** /**
@ -303,7 +306,8 @@ class Server implements CallbackListener {
public function getGameMode($stringValue = false, $parseValue = null) { public function getGameMode($stringValue = false, $parseValue = null) {
if (is_int($parseValue)) { if (is_int($parseValue)) {
$gameMode = $parseValue; $gameMode = $parseValue;
} else { }
else {
$gameMode = $this->maniaControl->client->getGameMode(); $gameMode = $this->maniaControl->client->getGameMode();
} }
if ($stringValue) { if ($stringValue) {
@ -338,7 +342,8 @@ class Server implements CallbackListener {
public function getValidationReplay($login) { public function getValidationReplay($login) {
try { try {
$replay = $this->maniaControl->client->getValidationReplay($login); $replay = $this->maniaControl->client->getValidationReplay($login);
} catch(Exception $e) { }
catch (Exception $e) {
// TODO temp added 19.04.2014 // TODO temp added 19.04.2014
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 330 Server.php" . $e->getMessage()); $this->maniaControl->errorHandler->triggerDebugNotice("Exception line 330 Server.php" . $e->getMessage());
@ -369,7 +374,8 @@ class Server implements CallbackListener {
// Save ghost replay // Save ghost replay
try { try {
$this->maniaControl->client->saveBestGhostsReplay($login, $fileName); $this->maniaControl->client->saveBestGhostsReplay($login, $fileName);
} catch(Exception $e) { }
catch (Exception $e) {
// TODO temp added 19.04.2014 // TODO temp added 19.04.2014
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 360 Server.php" . $e->getMessage()); $this->maniaControl->errorHandler->triggerDebugNotice("Exception line 360 Server.php" . $e->getMessage());