format test
This commit is contained in:
kremsy
Steffen Schröder
parent
6850804d61
commit
4c6a8862d8
@ -14,10 +14,10 @@ use ManiaControl\Players\Player;
|
||||
use ManiaControl\Players\PlayerManager;
|
||||
use ManiaControl\Plugins\PluginManager;
|
||||
use ManiaControl\Server\Server;
|
||||
use ManiaControl\Settings\SettingManager;
|
||||
use ManiaControl\Statistics\StatisticManager;
|
||||
use Maniaplanet\DedicatedServer\Connection;
|
||||
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
|
||||
use ManiaControl\Settings\SettingManager;
|
||||
|
||||
require_once __DIR__ . '/Maniaplanet/DedicatedServer/Connection.php';
|
||||
require_once __DIR__ . '/GbxDataFetcher/gbxdatafetcher.inc.php';
|
||||
@ -34,12 +34,12 @@ class ManiaControl implements CommandListener {
|
||||
/**
|
||||
* Constants
|
||||
*/
|
||||
const VERSION = '0.01';
|
||||
const API_VERSION = '2013-04-16';
|
||||
const OS_UNIX = 'Unix';
|
||||
const OS_WIN = 'Windows';
|
||||
const VERSION = '0.01';
|
||||
const API_VERSION = '2013-04-16';
|
||||
const OS_UNIX = 'Unix';
|
||||
const OS_WIN = 'Windows';
|
||||
const CONNECT_TIMEOUT = 20;
|
||||
const SCRIPT_TIMEOUT = 20;
|
||||
const SCRIPT_TIMEOUT = 20;
|
||||
|
||||
/**
|
||||
* Public properties
|
||||
@ -50,9 +50,7 @@ class ManiaControl implements CommandListener {
|
||||
public $chat = null;
|
||||
public $config = null;
|
||||
public $configurator = null;
|
||||
/**
|
||||
* @var Connection $client
|
||||
*/
|
||||
/** @var Connection $client */
|
||||
public $client = null;
|
||||
public $commandManager = null;
|
||||
public $database = null;
|
||||
@ -80,21 +78,21 @@ class ManiaControl implements CommandListener {
|
||||
$this->config = FileUtil::loadConfig('server.xml');
|
||||
|
||||
// Load ManiaControl Modules
|
||||
$this->database = new Database($this);
|
||||
$this->callbackManager = new CallbackManager($this);
|
||||
$this->settingManager = new SettingManager($this);
|
||||
$this->statisticManager = new StatisticManager($this);
|
||||
$this->manialinkManager = new ManialinkManager($this);
|
||||
$this->actionsMenu = new ActionsMenu($this);
|
||||
$this->chat = new Chat($this);
|
||||
$this->commandManager = new CommandManager($this);
|
||||
$this->server = new Server($this);
|
||||
$this->database = new Database($this);
|
||||
$this->callbackManager = new CallbackManager($this);
|
||||
$this->settingManager = new SettingManager($this);
|
||||
$this->statisticManager = new StatisticManager($this);
|
||||
$this->manialinkManager = new ManialinkManager($this);
|
||||
$this->actionsMenu = new ActionsMenu($this);
|
||||
$this->chat = new Chat($this);
|
||||
$this->commandManager = new CommandManager($this);
|
||||
$this->server = new Server($this);
|
||||
$this->authenticationManager = new AuthenticationManager($this);
|
||||
$this->playerManager = new PlayerManager($this);
|
||||
$this->mapManager = new MapManager($this);
|
||||
$this->configurator = new Configurator($this);
|
||||
$this->pluginManager = new PluginManager($this);
|
||||
$this->updateManager = new UpdateManager($this);
|
||||
$this->playerManager = new PlayerManager($this);
|
||||
$this->mapManager = new MapManager($this);
|
||||
$this->configurator = new Configurator($this);
|
||||
$this->pluginManager = new PluginManager($this);
|
||||
$this->updateManager = new UpdateManager($this);
|
||||
|
||||
// Register for commands
|
||||
$this->commandManager->registerCommandListener('version', $this, 'command_Version');
|
||||
@ -109,7 +107,7 @@ class ManiaControl implements CommandListener {
|
||||
*/
|
||||
public function log($message, $stripCodes = false) {
|
||||
$date = date("d.M y H:i:s");
|
||||
if ($stripCodes) {
|
||||
if($stripCodes) {
|
||||
$message = Formatter::stripCodes($message);
|
||||
}
|
||||
logMessage($date . ' ' . $message);
|
||||
@ -123,15 +121,15 @@ class ManiaControl implements CommandListener {
|
||||
*/
|
||||
public function getOS($compareOS = null) {
|
||||
$windows = defined('PHP_WINDOWS_VERSION_MAJOR');
|
||||
if ($compareOS) {
|
||||
if($compareOS) {
|
||||
// Return bool whether OS equals $compareOS
|
||||
if ($compareOS == self::OS_WIN) {
|
||||
if($compareOS == self::OS_WIN) {
|
||||
return $windows;
|
||||
}
|
||||
return !$windows;
|
||||
}
|
||||
// Return OS
|
||||
if ($windows) {
|
||||
if($windows) {
|
||||
return self::OS_WIN;
|
||||
}
|
||||
return self::OS_UNIX;
|
||||
@ -140,7 +138,7 @@ class ManiaControl implements CommandListener {
|
||||
/**
|
||||
* Handle Version Command
|
||||
*
|
||||
* @param array $chatCallback
|
||||
* @param array $chatCallback
|
||||
* @param Player $player
|
||||
*/
|
||||
public function command_Version(array $chatCallback, Player $player) {
|
||||
@ -151,11 +149,11 @@ class ManiaControl implements CommandListener {
|
||||
/**
|
||||
* Handle Restart AdminCommand
|
||||
*
|
||||
* @param array $chatCallback
|
||||
* @param array $chatCallback
|
||||
* @param 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);
|
||||
return;
|
||||
}
|
||||
@ -165,11 +163,11 @@ class ManiaControl implements CommandListener {
|
||||
/**
|
||||
* Handle //shutdown command
|
||||
*
|
||||
* @param array $chat
|
||||
* @param array $chat
|
||||
* @param 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);
|
||||
return;
|
||||
}
|
||||
@ -182,7 +180,7 @@ class ManiaControl implements CommandListener {
|
||||
* @param string $message
|
||||
*/
|
||||
public function quit($message = null) {
|
||||
if ($message) {
|
||||
if($message) {
|
||||
$this->log($message);
|
||||
}
|
||||
exit();
|
||||
@ -219,7 +217,7 @@ class ManiaControl implements CommandListener {
|
||||
|
||||
// Announce restart
|
||||
$this->chat->sendInformation('Restarting ManiaControl...');
|
||||
if ($message) {
|
||||
if($message) {
|
||||
$this->log($message);
|
||||
}
|
||||
|
||||
@ -229,11 +227,10 @@ class ManiaControl implements CommandListener {
|
||||
$this->log('Restarting ManiaControl!');
|
||||
|
||||
// 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 &';
|
||||
exec($command);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$command = escapeshellarg(ManiaControlDir . "\ManiaControl.bat");
|
||||
system($command); // TODO, windows stucks here as long controller is running
|
||||
}
|
||||
@ -265,7 +262,7 @@ class ManiaControl implements CommandListener {
|
||||
$this->log('Loading completed!');
|
||||
|
||||
// Main loop
|
||||
while (!$this->shutdownRequested) {
|
||||
while(!$this->shutdownRequested) {
|
||||
$loopStart = microtime(true);
|
||||
|
||||
// Disable script timeout
|
||||
@ -275,9 +272,9 @@ class ManiaControl implements CommandListener {
|
||||
$this->callbackManager->manageCallbacks();
|
||||
|
||||
// Yield for next tick
|
||||
$loopEnd = microtime(true);
|
||||
$loopEnd = microtime(true);
|
||||
$sleepTime = 300000 - $loopEnd + $loopStart;
|
||||
if ($sleepTime > 0) {
|
||||
if($sleepTime > 0) {
|
||||
usleep($sleepTime);
|
||||
}
|
||||
}
|
||||
@ -292,46 +289,44 @@ class ManiaControl implements CommandListener {
|
||||
private function connect() {
|
||||
// Load remote client
|
||||
$host = $this->config->server->xpath('host');
|
||||
if (!$host) {
|
||||
if(!$host) {
|
||||
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
|
||||
}
|
||||
$host = (string) $host[0];
|
||||
$host = (string)$host[0];
|
||||
$port = $this->config->server->xpath('port');
|
||||
if (!$host) {
|
||||
if(!$host) {
|
||||
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}...");
|
||||
|
||||
$login = $this->config->server->xpath('login');
|
||||
if (!$login) {
|
||||
if(!$login) {
|
||||
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
|
||||
}
|
||||
$login = (string) $login[0];
|
||||
$pass = $this->config->server->xpath('pass');
|
||||
if (!$pass) {
|
||||
$login = (string)$login[0];
|
||||
$pass = $this->config->server->xpath('pass');
|
||||
if(!$pass) {
|
||||
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
|
||||
}
|
||||
$pass = (string) $pass[0];
|
||||
$pass = (string)$pass[0];
|
||||
|
||||
try {
|
||||
$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);
|
||||
}
|
||||
|
||||
// Enable callback system
|
||||
try {
|
||||
$this->client->enableCallbacks(true);
|
||||
}
|
||||
catch (Exception $e) {
|
||||
} catch(Exception $e) {
|
||||
trigger_error("Couldn't enable callbacks! " . $e->getMessage(), E_USER_ERROR);
|
||||
}
|
||||
|
||||
// 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);
|
||||
}
|
||||
|
||||
@ -348,27 +343,25 @@ class ManiaControl implements CommandListener {
|
||||
$this->client->sendHideManialinkPage();
|
||||
|
||||
// Enable script callbacks if needed
|
||||
if ($this->server->getGameMode() != 0) {
|
||||
if($this->server->getGameMode() != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
$scriptSettings = $this->client->getModeScriptSettings();
|
||||
}
|
||||
catch (Exception $e) {
|
||||
} catch(Exception $e) {
|
||||
trigger_error("Couldn't get mode script settings. " . $e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
|
||||
if(!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$scriptSettings['S_UseScriptCallbacks'] = true;
|
||||
try {
|
||||
$this->client->setModeScriptSettings($scriptSettings);
|
||||
}
|
||||
catch (Exception $e) {
|
||||
} catch(Exception $e) {
|
||||
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user