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

updated server.php

Browse Source
This commit is contained in:
kremsy
2014-01-16 17:31:15 +01:00
committed by Steffen Schröder
parent 3ae50c9af6
commit 5a2d849137
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,11 +132,10 @@ class Server implements CallbackListener {
*/ */
public function getDataDirectory() { public function getDataDirectory() {
if($this->dataDirectory == '') { if($this->dataDirectory == '') {
if(!$this->maniaControl->client->query('GameDataDirectory')) { if(!$this->dataDirectory = $this->maniaControl->client->gameDataDirectory()) {
trigger_error("Couldn't get data directory. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't get data directory. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
$this->dataDirectory = $this->maniaControl->client->getResponse();
} }
return $this->dataDirectory; return $this->dataDirectory;
} }
@@ -176,17 +175,18 @@ class Server implements CallbackListener {
public function getInfo($detailed = false) { public function getInfo($detailed = false) {
if($detailed) { if($detailed) {
$login = $this->login; $login = $this->login;
if(!$this->maniaControl->client->query('GetDetailedPlayerInfo', $login)) { if(!$info = $this->maniaControl->client->getDetailedPlayerInfo($login)) {
trigger_error("Couldn't fetch detailed server info. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch detailed server info. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $info;
} }
if(!$this->maniaControl->client->query('GetMainServerPlayerInfo')) {
if(!$info = $this->maniaControl->client->getMainServerPlayerInfo()) {
trigger_error("Couldn't fetch server info. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server info. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $info;
} }
/** /**
@@ -195,11 +195,11 @@ class Server implements CallbackListener {
* @return array * @return array
*/ */
public function getOptions() { public function getOptions() {
if(!$this->maniaControl->client->query('GetServerOptions')) { if(!$options = $this->maniaControl->client->getServerOptions()) {
trigger_error("Couldn't fetch server options. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server options. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $options;
} }
/** /**
@@ -208,11 +208,11 @@ class Server implements CallbackListener {
* @return string * @return string
*/ */
public function getName() { public function getName() {
if(!$this->maniaControl->client->query('GetServerName')) { if(!$name = $this->maniaControl->client->getServerName()) {
trigger_error("Couldn't fetch server name. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server name. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $name;
} }
/** /**
@@ -221,11 +221,11 @@ class Server implements CallbackListener {
* @return string * @return string
*/ */
public function getVersion() { public function getVersion() {
if(!$this->maniaControl->client->query('GetVersion')) { if(!$version = $this->maniaControl->client->getVersion()) {
trigger_error("Couldn't fetch server version. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server version. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $version;
} }
/** /**
@@ -234,11 +234,11 @@ class Server implements CallbackListener {
* @return array * @return array
*/ */
public function getSystemInfo() { public function getSystemInfo() {
if(!$this->maniaControl->client->query('GetSystemInfo')) { if(!$systemInfo = $this->maniaControl->client->getSystemInfo()) {
trigger_error("Couldn't fetch server system info. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch server system info. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $systemInfo;
} }
/** /**
@@ -252,11 +252,12 @@ class Server implements CallbackListener {
if(is_int($parseValue)) { if(is_int($parseValue)) {
$gameMode = $parseValue; $gameMode = $parseValue;
} else { } else {
if(!$this->maniaControl->client->query('GetGameMode')) { $gameMode = $this->maniaControl->client->getGameMode();
/*if(!$gameMode = $this->maniaControl->client->getGameMode()){
trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }*/
$gameMode = $this->maniaControl->client->getResponse();
} }
if($stringValue) { if($stringValue) {
switch($gameMode) { switch($gameMode) {
@@ -288,11 +289,11 @@ class Server implements CallbackListener {
* @return string * @return string
*/ */
public function getValidationReplay(Player $player) { public function getValidationReplay(Player $player) {
if(!$this->maniaControl->client->query('GetValidationReplay', $player->login)) { if(!$replay = $this->maniaControl->client->getValidationReplay($player->login)) {
trigger_error("Couldn't get validation replay of '{$player->login}'. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't get validation replay of '{$player->login}'. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
return $this->maniaControl->client->getResponse(); return $replay;
} }
/** /**
@@ -308,13 +309,13 @@ class Server implements CallbackListener {
} }
// Build file name // Build file name
$map = $this->getMap(); $map = $this->getMap(); //TODO does that work?=
$gameMode = $this->getGameMode(); $gameMode = $this->getGameMode();
$time = time(); $time = time();
$fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx"; $fileName = "GhostReplays/Ghost.{$player->login}.{$gameMode}.{$time}.{$map['UId']}.Replay.Gbx";
// Save ghost replay // Save ghost replay
if(!$this->maniaControl->client->query('SaveBestGhostsReplay', $player->login, $fileName)) { if(!$this->maniaControl->client->saveBestGhostsReplay($player->login, $fileName)) {
trigger_error("Couldn't save ghost replay. " . $this->maniaControl->getClientErrorText()); trigger_error("Couldn't save ghost replay. " . $this->maniaControl->getClientErrorText());
return null; return null;
} }
@@ -335,10 +336,9 @@ class Server implements CallbackListener {
* @return bool * @return bool
*/ */
public function waitForStatus($statusCode = 4) { public function waitForStatus($statusCode = 4) {
$this->maniaControl->client->query('GetStatus'); $response = $this->maniaControl->client->getStatus();
$response = $this->maniaControl->client->getResponse();
// Check if server has the given status // Check if server has the given status
if($response['Code'] === 4) { if($response->code === 4) {
return true; return true;
} }
// Server not yet in given status - Wait for it... // Server not yet in given status - Wait for it...
@@ -347,10 +347,9 @@ class Server implements CallbackListener {
$lastStatus = $response['Name']; $lastStatus = $response['Name'];
$this->maniaControl->log("Waiting for server to reach status {$statusCode}..."); $this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
$this->maniaControl->log("Current Status: {$lastStatus}"); $this->maniaControl->log("Current Status: {$lastStatus}");
while($response['Code'] !== 4) { while($response->code !== 4) {
sleep(1); sleep(1);
$this->maniaControl->client->query('GetStatus'); $response = $this->maniaControl->client->getStatus();
$response = $this->maniaControl->client->getResponse();
if($lastStatus !== $response['Name']) { if($lastStatus !== $response['Name']) {
$this->maniaControl->log("New Status: {$response['Name']}"); $this->maniaControl->log("New Status: {$response['Name']}");
$lastStatus = $response['Name']; $lastStatus = $response['Name'];