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

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

@ -6,6 +6,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use ManiaControl\CommandLineHelper;
/**
* Class providing Access to the connected ManiaPlanet Server
@ -24,7 +25,10 @@ class Server implements CallbackListener {
/*
* Public Properties
*/
/** @var Config $config */
/**
*
* @var Config $config
*/
public $config = null;
public $index = -1;
public $ip = null;
@ -64,69 +68,68 @@ class Server implements CallbackListener {
* Load the Server Configuration from the Config XML
*/
public function loadConfig() {
if (!$this->maniaControl->config) {
trigger_error('Error loading Server Config!', E_USER_ERROR);
}
// 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;
}
// Server id parameter
$serverId = CommandLineHelper::getParameter('-id');
// Xml server tag with given id
$serverTag = null;
if ($id) {
$serverTags = $this->maniaControl->config->xpath("server[@id='{$id}']");
if ($serverTags)
if ($serverId) {
$serverTags = $this->maniaControl->config->xpath("server[@id='{$serverId}']");
if ($serverTags) {
$serverTag = $serverTags[0];
if (!$serverTag)
trigger_error("No Server configured with the ID '{$id}'!", E_USER_ERROR);
} else {
}
if (!$serverTag) {
trigger_error("No Server configured with the ID '{$serverId}'!", E_USER_ERROR);
}
}
else {
$serverTags = $this->maniaControl->config->xpath('server');
if ($serverTags)
if ($serverTags) {
$serverTag = $serverTags[0];
if (!$serverTag)
}
if (!$serverTag) {
trigger_error('No Server configured!', E_USER_ERROR);
}
}
// Host
$host = $serverTag->xpath('host');
if ($host)
$host = (string)$host[0];
if (!$host)
if ($host) {
$host = (string) $host[0];
}
if (!$host) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
}
// Port
$port = $serverTag->xpath('port');
if ($port)
$port = (string)$port[0];
if (!$port)
if ($port) {
$port = (string) $port[0];
}
if (!$port) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
}
// Login
$login = $serverTag->xpath('login');
if ($login)
$login = (string)$login[0];
if (!$login)
if ($login) {
$login = (string) $login[0];
}
if (!$login) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
}
// Pass
// Password
$pass = $serverTag->xpath('pass');
if ($pass)
$pass = (string)$pass[0];
if (!$pass)
if ($pass) {
$pass = (string) $pass[0];
}
if (!$pass) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
}
// Create config object
$this->config = new Config($id, $host, $port, $login, $pass);
$this->config = new Config($serverId, $host, $port, $login, $pass);
}
/**
@ -207,7 +210,7 @@ class Server implements CallbackListener {
}
$servers = array();
while($row = $result->fetch_object()) {
while ($row = $result->fetch_object()) {
array_push($servers, $row);
}
$result->close();
@ -303,11 +306,12 @@ class Server implements CallbackListener {
public function getGameMode($stringValue = false, $parseValue = null) {
if (is_int($parseValue)) {
$gameMode = $parseValue;
} else {
}
else {
$gameMode = $this->maniaControl->client->getGameMode();
}
if ($stringValue) {
switch($gameMode) {
switch ($gameMode) {
case 0:
return 'Script';
case 1:
@ -338,8 +342,9 @@ class Server implements CallbackListener {
public function getValidationReplay($login) {
try {
$replay = $this->maniaControl->client->getValidationReplay($login);
} catch(Exception $e) {
//TODO temp added 19.04.2014
}
catch (Exception $e) {
// TODO temp added 19.04.2014
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 330 Server.php" . $e->getMessage());
trigger_error("Couldn't get validation replay of '{$login}'. " . $e->getMessage());
@ -369,8 +374,9 @@ class Server implements CallbackListener {
// Save ghost replay
try {
$this->maniaControl->client->saveBestGhostsReplay($login, $fileName);
} catch(Exception $e) {
//TODO temp added 19.04.2014
}
catch (Exception $e) {
// TODO temp added 19.04.2014
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 360 Server.php" . $e->getMessage());
trigger_error("Couldn't save ghost replay. " . $e->getMessage());
@ -404,7 +410,7 @@ class Server implements CallbackListener {
$lastStatus = $response->name;
$this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
$this->maniaControl->log("Current Status: {$lastStatus}");
while($response->code !== 4) {
while ($response->code !== 4) {
sleep(1);
$response = $this->maniaControl->client->getStatus();
if ($lastStatus !== $response->name) {