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

format test

Browse Source
This commit is contained in:
kremsy 2014-01-27 17:29:48 +01:00 committed by Steffen Schröder
parent 6850804d61
commit 4c6a8862d8
1 changed files with 89 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
application/core/ManiaControl.php
View File

@ -14,10 +14,10 @@ use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager; use ManiaControl\Players\PlayerManager;
use ManiaControl\Plugins\PluginManager; use ManiaControl\Plugins\PluginManager;
use ManiaControl\Server\Server; use ManiaControl\Server\Server;
use ManiaControl\Settings\SettingManager;
use ManiaControl\Statistics\StatisticManager; use ManiaControl\Statistics\StatisticManager;
use Maniaplanet\DedicatedServer\Connection; use Maniaplanet\DedicatedServer\Connection;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use ManiaControl\Settings\SettingManager;
require_once __DIR__ . '/Maniaplanet/DedicatedServer/Connection.php'; require_once __DIR__ . '/Maniaplanet/DedicatedServer/Connection.php';
require_once __DIR__ . '/GbxDataFetcher/gbxdatafetcher.inc.php'; require_once __DIR__ . '/GbxDataFetcher/gbxdatafetcher.inc.php';
@ -50,9 +50,7 @@ class ManiaControl implements CommandListener {
public $chat = null; public $chat = null;
public $config = null; public $config = null;
public $configurator = null; public $configurator = null;
/** /** @var Connection $client */
* @var Connection $client
*/
public $client = null; public $client = null;
public $commandManager = null; public $commandManager = null;
public $database = null; public $database = null;
@ -109,7 +107,7 @@ class ManiaControl implements CommandListener {
*/ */
public function log($message, $stripCodes = false) { public function log($message, $stripCodes = false) {
$date = date("d.M y H:i:s"); $date = date("d.M y H:i:s");
if ($stripCodes) { if($stripCodes) {
$message = Formatter::stripCodes($message); $message = Formatter::stripCodes($message);
} }
logMessage($date . ' ' . $message); logMessage($date . ' ' . $message);
@ -123,15 +121,15 @@ class ManiaControl implements CommandListener {
*/ */
public function getOS($compareOS = null) { public function getOS($compareOS = null) {
$windows = defined('PHP_WINDOWS_VERSION_MAJOR'); $windows = defined('PHP_WINDOWS_VERSION_MAJOR');
if ($compareOS) { if($compareOS) {
// Return bool whether OS equals $compareOS // Return bool whether OS equals $compareOS
if ($compareOS == self::OS_WIN) { if($compareOS == self::OS_WIN) {
return $windows; return $windows;
} }
return !$windows; return !$windows;
} }
// Return OS // Return OS
if ($windows) { if($windows) {
return self::OS_WIN; return self::OS_WIN;
} }
return self::OS_UNIX; return self::OS_UNIX;
@ -155,7 +153,7 @@ class ManiaControl implements CommandListener {
* @param Player $player * @param Player $player
*/ */
public function command_Restart(array $chatCallback, Player $player) { public function command_Restart(array $chatCallback, Player $player) {
if (!AuthenticationManager::checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { if(!AuthenticationManager::checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) {
$this->authenticationManager->sendNotAllowed($player); $this->authenticationManager->sendNotAllowed($player);
return; return;
} }
@ -169,7 +167,7 @@ class ManiaControl implements CommandListener {
* @param Player $player * @param Player $player
*/ */
public function command_Shutdown(array $chat, Player $player) { public function command_Shutdown(array $chat, Player $player) {
if (!$this->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) { if(!$this->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_SUPERADMIN)) {
$this->authenticationManager->sendNotAllowed($player); $this->authenticationManager->sendNotAllowed($player);
return; return;
} }
@ -182,7 +180,7 @@ class ManiaControl implements CommandListener {
* @param string $message * @param string $message
*/ */
public function quit($message = null) { public function quit($message = null) {
if ($message) { if($message) {
$this->log($message); $this->log($message);
} }
exit(); exit();
@ -219,7 +217,7 @@ class ManiaControl implements CommandListener {
// Announce restart // Announce restart
$this->chat->sendInformation('Restarting ManiaControl...'); $this->chat->sendInformation('Restarting ManiaControl...');
if ($message) { if($message) {
$this->log($message); $this->log($message);
} }
@ -229,11 +227,10 @@ class ManiaControl implements CommandListener {
$this->log('Restarting ManiaControl!'); $this->log('Restarting ManiaControl!');
// Execute start script in background // Execute start script in background
if ($this->getOS(self::OS_UNIX)) { if($this->getOS(self::OS_UNIX)) {
$command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &'; $command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &';
exec($command); exec($command);
} } else {
else {
$command = escapeshellarg(ManiaControlDir . "\ManiaControl.bat"); $command = escapeshellarg(ManiaControlDir . "\ManiaControl.bat");
system($command); // TODO, windows stucks here as long controller is running system($command); // TODO, windows stucks here as long controller is running
} }
@ -265,7 +262,7 @@ class ManiaControl implements CommandListener {
$this->log('Loading completed!'); $this->log('Loading completed!');
// Main loop // Main loop
while (!$this->shutdownRequested) { while(!$this->shutdownRequested) {
$loopStart = microtime(true); $loopStart = microtime(true);
// Disable script timeout // Disable script timeout
@ -277,7 +274,7 @@ class ManiaControl implements CommandListener {
// Yield for next tick // Yield for next tick
$loopEnd = microtime(true); $loopEnd = microtime(true);
$sleepTime = 300000 - $loopEnd + $loopStart; $sleepTime = 300000 - $loopEnd + $loopStart;
if ($sleepTime > 0) { if($sleepTime > 0) {
usleep($sleepTime); usleep($sleepTime);
} }
} }
@ -292,46 +289,44 @@ class ManiaControl implements CommandListener {
private function connect() { private function connect() {
// Load remote client // Load remote client
$host = $this->config->server->xpath('host'); $host = $this->config->server->xpath('host');
if (!$host) { if(!$host) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR); trigger_error("Invalid server configuration (host).", E_USER_ERROR);
} }
$host = (string) $host[0]; $host = (string)$host[0];
$port = $this->config->server->xpath('port'); $port = $this->config->server->xpath('port');
if (!$host) { if(!$host) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR); trigger_error("Invalid server configuration (port).", E_USER_ERROR);
} }
$port = (string) $port[0]; $port = (string)$port[0];
$this->log("Connecting to server at {$host}:{$port}..."); $this->log("Connecting to server at {$host}:{$port}...");
$login = $this->config->server->xpath('login'); $login = $this->config->server->xpath('login');
if (!$login) { if(!$login) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR); trigger_error("Invalid server configuration (login).", E_USER_ERROR);
} }
$login = (string) $login[0]; $login = (string)$login[0];
$pass = $this->config->server->xpath('pass'); $pass = $this->config->server->xpath('pass');
if (!$pass) { if(!$pass) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR); trigger_error("Invalid server configuration (password).", E_USER_ERROR);
} }
$pass = (string) $pass[0]; $pass = (string)$pass[0];
try { try {
$this->client = Connection::factory($host, $port, self::CONNECT_TIMEOUT, $login, $pass); $this->client = Connection::factory($host, $port, self::CONNECT_TIMEOUT, $login, $pass);
} } catch(Exception $e) {
catch (Exception $e) {
trigger_error("Couldn't authenticate on server with user '{$login}'! " . $e->getMessage(), E_USER_ERROR); trigger_error("Couldn't authenticate on server with user '{$login}'! " . $e->getMessage(), E_USER_ERROR);
} }
// Enable callback system // Enable callback system
try { try {
$this->client->enableCallbacks(true); $this->client->enableCallbacks(true);
} } catch(Exception $e) {
catch (Exception $e) {
trigger_error("Couldn't enable callbacks! " . $e->getMessage(), E_USER_ERROR); trigger_error("Couldn't enable callbacks! " . $e->getMessage(), E_USER_ERROR);
} }
// Wait for server to be ready // Wait for server to be ready
if (!$this->server->waitForStatus(4)) { if(!$this->server->waitForStatus(4)) {
trigger_error("Server couldn't get ready!", E_USER_ERROR); trigger_error("Server couldn't get ready!", E_USER_ERROR);
} }
@ -348,27 +343,25 @@ class ManiaControl implements CommandListener {
$this->client->sendHideManialinkPage(); $this->client->sendHideManialinkPage();
// Enable script callbacks if needed // Enable script callbacks if needed
if ($this->server->getGameMode() != 0) { if($this->server->getGameMode() != 0) {
return; return;
} }
try { try {
$scriptSettings = $this->client->getModeScriptSettings(); $scriptSettings = $this->client->getModeScriptSettings();
} } catch(Exception $e) {
catch (Exception $e) {
trigger_error("Couldn't get mode script settings. " . $e->getMessage()); trigger_error("Couldn't get mode script settings. " . $e->getMessage());
return; return;
} }
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) { if(!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
return; return;
} }
$scriptSettings['S_UseScriptCallbacks'] = true; $scriptSettings['S_UseScriptCallbacks'] = true;
try { try {
$this->client->setModeScriptSettings($scriptSettings); $this->client->setModeScriptSettings($scriptSettings);
} } catch(Exception $e) {
catch (Exception $e) {
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage()); trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
return; return;
} }