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

terminate client, moved loading to other position

Browse Source
This commit is contained in:
kremsy 2014-01-10 13:08:26 +01:00
parent c28cb01f9e
commit 26d2173fa2
1 changed files with 114 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
application/core/ManiaControl.php
View File

@ -44,8 +44,7 @@ require_once __DIR__ . '/UpdateManager.php';
list($endiantest) = array_values(unpack('L1L', pack('V', 1)));
if($endiantest == 1) {
require_once __DIR__ . '/PhpRemote/GbxRemote.inc.php';
}
else {
} else {
require_once __DIR__ . '/PhpRemote/GbxRemote.bem.php';
}
@ -217,7 +216,9 @@ class ManiaControl implements CommandListener {
* @param string $message
*/
public function quit($message = null) {
if ($message) $this->log($message);
if($message) {
$this->log($message);
}
exit();
}
@ -252,7 +253,9 @@ class ManiaControl implements CommandListener {
// Announce restart
$this->chat->sendInformation('Restarting ManiaControl...');
if ($message) $this->log($message);
if($message) {
$this->log($message);
}
// Hide widgets
$this->client->query('SendHideManialinkPage');
@ -266,8 +269,7 @@ class ManiaControl implements CommandListener {
if($this->getOS(self::OS_UNIX)) {
$command = 'sh ' . escapeshellarg(ManiaControlDir . '/ManiaControl.sh') . ' > /dev/null &';
exec($command);
}
else {
} else {
// TODO: validate restart on windows
$command = 'start /B ' . escapeshellarg(ManiaControlDir . '/ManiaControl.bat');
pclose(popen($command, 'r'));
@ -291,14 +293,14 @@ class ManiaControl implements CommandListener {
// Register shutdown handler
register_shutdown_function(array($this, 'handleShutdown'));
// Loading finished
$this->log('Loading completed!');
// OnInit callback
$this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT));
// Announce ManiaControl
$this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!');
// OnInit callback
$this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT));
// Loading finished
$this->log('Loading completed!');
// Main loop
while(!$this->shutdownRequested) {
@ -318,6 +320,9 @@ class ManiaControl implements CommandListener {
}
}
//Close the client connection
$this->client->Terminate();
// Shutdown
$this->quit();
}
@ -330,10 +335,14 @@ class ManiaControl implements CommandListener {
$this->client = new \IXR_ClientMulticall_Gbx();
$host = $this->config->server->xpath('host');
if (!$host) trigger_error("Invalid server configuration (host).", E_USER_ERROR);
if(!$host) {
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
}
$host = (string)$host[0];
$port = $this->config->server->xpath('port');
if (!$host) trigger_error("Invalid server configuration (port).", E_USER_ERROR);
if(!$host) {
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
}
$port = (string)$port[0];
$this->log("Connecting to server at {$host}:{$port}...");
@ -344,10 +353,14 @@ class ManiaControl implements CommandListener {
}
$login = $this->config->server->xpath('login');
if (!$login) trigger_error("Invalid server configuration (login).", E_USER_ERROR);
if(!$login) {
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
}
$login = (string)$login[0];
$pass = $this->config->server->xpath('pass');
if (!$pass) trigger_error("Invalid server configuration (password).", E_USER_ERROR);
if(!$pass) {
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
}
$pass = (string)$pass[0];
// Authenticate
@ -377,13 +390,17 @@ class ManiaControl implements CommandListener {
$this->client->query('SendHideManialinkPage');
// Enable script callbacks if needed
if ($this->server->getGameMode() != 0) return;
if($this->server->getGameMode() != 0) {
return;
}
if(!$this->client->query('GetModeScriptSettings')) {
trigger_error("Couldn't get mode script settings. " . $this->getClientErrorText());
return;
}
$scriptSettings = $this->client->getResponse();
if (!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) return;
if(!array_key_exists('S_UseScriptCallbacks', $scriptSettings)) {
return;
}
$scriptSettings['S_UseScriptCallbacks'] = true;
if(!$this->client->query('SetModeScriptSettings', $scriptSettings)) {
trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText());