From 0ac8fcde15561ba82e92e570222ccf531f05ea4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Sun, 10 Nov 2013 17:29:21 +0100 Subject: [PATCH] fixed last commit --- application/core/maniaControl.php | 236 +++++++++++++++++++++++++ application/core/maniaControlClass.php | 236 ------------------------- 2 files changed, 236 insertions(+), 236 deletions(-) create mode 100644 application/core/maniaControl.php delete mode 100644 application/core/maniaControlClass.php diff --git a/application/core/maniaControl.php b/application/core/maniaControl.php new file mode 100644 index 00000000..ed00bc65 --- /dev/null +++ b/application/core/maniaControl.php @@ -0,0 +1,236 @@ +database = new Database($this); + $this->settingManager = new SettingManager($this); + $this->chat = new Chat($this); + $this->callbacks = new Callbacks($this); + $this->server = new Server($this); + $this->authentication = new Authentication($this); + $this->playerHandler = new PlayerHandler($this); + $this->manialinkIdHandler = new ManialinkIdHandler(); + $this->commands = new Commands($this); + $this->pluginHandler = new PluginHandler($this); + $this->settingConfigurator = new SettingConfigurator($this); + } + + /** + * Return message composed of client error message and error code + * + * @param object $client + * @return string + */ + public function getClientErrorText($client = null) { + if (is_object($client)) { + return $client->getErrorMessage() . ' (' . $client->getErrorCode() . ')'; + } + return $this->client->getErrorMessage() . ' (' . $this->client->getErrorCode() . ')'; + } + + /** + * Quit ManiaControl and log the given message + */ + public function quit($message = false) { + if ($this->client) { + // Announce quit + $this->chat->sendInformation('ManiaControl shutting down.'); + + // Hide manialinks + $this->client->query('SendHideManialinkPage'); + } + + // Log quit reason + if ($message) { + error_log($message); + } + + // Shutdown + if ($this->client) { + $this->client->Terminate(); + } + + error_log("Quitting ManiaControl!"); + exit(); + } + + /** + * Run ManiaControl + */ + public function run() { + error_log('Starting ManiaControl v' . self::VERSION . '!'); + + // Load plugins + $this->pluginHandler->loadPlugins(); + + // Connect to server + $this->connect(); + + // Loading finished + error_log("Loading completed!"); + + // Announce ManiaControl + $this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!'); + + // OnInit + $this->callbacks->onInit(); + + // Main loop + while (!$this->shutdownRequested) { + $loopStart = microtime(true); + + // Disable script timeout + set_time_limit(30); + + // Handle server callbacks + $this->callbacks->handleCallbacks(); + + // Yield for next tick + $loopEnd = microtime(true); + $sleepTime = 300000 - $loopEnd + $loopStart; + if ($sleepTime > 0) { + usleep($sleepTime); + } + } + + // Shutdown + $this->client->Terminate(); + } + + /** + * Connect to ManiaPlanet server + */ + private function connect() { + // Load remote client + $this->client = new \IXR_ClientMulticall_Gbx(); + + $host = $this->server->config->xpath('host'); + if (!$host) trigger_error("Invalid server configuration (host).", E_USER_ERROR); + $host = (string) $host[0]; + $port = $this->server->config->xpath('port'); + if (!$host) trigger_error("Invalid server configuration (port).", E_USER_ERROR); + $port = (string) $port[0]; + + error_log("Connecting to server at {$host}:{$port}..."); + + // Connect + if (!$this->client->InitWithIp($host, $port, 20)) { + trigger_error("Couldn't connect to server! " . $this->getClientErrorText(), E_USER_ERROR); + } + + $login = $this->server->config->xpath('login'); + if (!$login) trigger_error("Invalid server configuration (login).", E_USER_ERROR); + $login = (string) $login[0]; + $pass = $this->server->config->xpath('pass'); + if (!$pass) trigger_error("Invalid server configuration (password).", E_USER_ERROR); + $pass = (string) $pass[0]; + + // Authenticate + if (!$this->client->query('Authenticate', $login, $pass)) { + trigger_error("Couldn't authenticate on server with user '{$login}'! " . $this->getClientErrorText(), E_USER_ERROR); + } + + // Enable callback system + if (!$this->client->query('EnableCallbacks', true)) { + trigger_error("Couldn't enable callbacks! " . $this->getClientErrorText(), E_USER_ERROR); + } + + // Wait for server to be ready + if (!$this->server->waitForStatus($this->client, 4)) { + trigger_error("Server couldn't get ready!", E_USER_ERROR); + } + + // Set api version + if (!$this->client->query('SetApiVersion', self::API_VERSION)) { + trigger_error( + "Couldn't set API version '" . self::API_VERSION . "'! This might cause problems. " . $this->getClientErrorText()); + } + + // Connect finished + error_log("Server connection succesfully established!"); + + // Enable script callbacks if needed + if ($this->server->getGameMode() === 0) { + if (!$this->client->query('GetModeScriptSettings')) { + trigger_error("Couldn't get mode script settings. " . $this->getClientErrorText()); + } + else { + $scriptSettings = $this->client->getResponse(); + if (array_key_exists('S_UseScriptCallbacks', $scriptSettings)) { + $scriptSettings['S_UseScriptCallbacks'] = true; + if (!$this->client->query('SetModeScriptSettings', $scriptSettings)) { + trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText()); + } + else { + error_log("Script callbacks successfully enabled."); + } + } + } + } + } +} + +?> diff --git a/application/core/maniaControlClass.php b/application/core/maniaControlClass.php deleted file mode 100644 index 9e427a6e..00000000 --- a/application/core/maniaControlClass.php +++ /dev/null @@ -1,236 +0,0 @@ -database = new Database($this); - $this->settingManager = new SettingManager($this); - $this->chat = new Chat($this); - $this->callbacks = new Callbacks($this); - $this->server = new Server($this); - $this->authentication = new Authentication($this); - $this->playerHandler = new PlayerHandler($this); - $this->manialinkIdHandler = new ManialinkIdHandler(); - $this->commands = new Commands($this); - $this->pluginHandler = new PluginHandler($this); - $this->settingConfigurator = new SettingConfigurator($this); - } - - /** - * Return message composed of client error message and error code - * - * @param object $client - * @return string - */ - public function getClientErrorText($client = null) { - if (is_object($client)) { - return $client->getErrorMessage() . ' (' . $client->getErrorCode() . ')'; - } - return $this->client->getErrorMessage() . ' (' . $this->client->getErrorCode() . ')'; - } - - /** - * Quit ManiaControl and log the given message - */ - public function quit($message = false) { - if ($this->client) { - // Announce quit - $this->chat->sendInformation('ManiaControl shutting down.'); - - // Hide manialinks - $this->client->query('SendHideManialinkPage'); - } - - // Log quit reason - if ($message) { - error_log($message); - } - - // Shutdown - if ($this->client) { - $this->client->Terminate(); - } - - error_log("Quitting ManiaControl!"); - exit(); - } - - /** - * Run ManiaControl - */ - public function run() { - error_log('Starting ManiaControl v' . self::VERSION . '!'); - - // Load plugins - $this->pluginHandler->loadPlugins(); - - // Connect to server - $this->connect(); - - // Loading finished - error_log("Loading completed!"); - - // Announce ManiaControl - $this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!'); - - // OnInit - $this->callbacks->onInit(); - - // Main loop - while (!$this->shutdownRequested) { - $loopStart = microtime(true); - - // Disable script timeout - set_time_limit(30); - - // Handle server callbacks - $this->callbacks->handleCallbacks(); - - // Yield for next tick - $loopEnd = microtime(true); - $sleepTime = 300000 - $loopEnd + $loopStart; - if ($sleepTime > 0) { - usleep($sleepTime); - } - } - - // Shutdown - $this->client->Terminate(); - } - - /** - * Connect to ManiaPlanet server - */ - private function connect() { - // Load remote client - $this->client = new \IXR_ClientMulticall_Gbx(); - - $host = $this->server->config->xpath('host'); - if (!$host) trigger_error("Invalid server configuration (host).", E_USER_ERROR); - $host = (string) $host[0]; - $port = $this->server->config->xpath('port'); - if (!$host) trigger_error("Invalid server configuration (port).", E_USER_ERROR); - $port = (string) $port[0]; - - error_log("Connecting to server at {$host}:{$port}..."); - - // Connect - if (!$this->client->InitWithIp($host, $port, 20)) { - trigger_error("Couldn't connect to server! " . $this->getClientErrorText(), E_USER_ERROR); - } - - $login = $this->server->config->xpath('login'); - if (!$login) trigger_error("Invalid server configuration (login).", E_USER_ERROR); - $login = (string) $login[0]; - $pass = $this->server->config->xpath('pass'); - if (!$pass) trigger_error("Invalid server configuration (password).", E_USER_ERROR); - $pass = (string) $pass[0]; - - // Authenticate - if (!$this->client->query('Authenticate', $login, $pass)) { - trigger_error("Couldn't authenticate on server with user '{$login}'! " . $this->getClientErrorText(), E_USER_ERROR); - } - - // Enable callback system - if (!$this->client->query('EnableCallbacks', true)) { - trigger_error("Couldn't enable callbacks! " . $this->getClientErrorText(), E_USER_ERROR); - } - - // Wait for server to be ready - if (!$this->server->waitForStatus($this->client, 4)) { - trigger_error("Server couldn't get ready!", E_USER_ERROR); - } - - // Set api version - if (!$this->client->query('SetApiVersion', self::API_VERSION)) { - trigger_error( - "Couldn't set API version '" . self::API_VERSION . "'! This might cause problems. " . $this->getClientErrorText()); - } - - // Connect finished - error_log("Server connection succesfully established!"); - - // Enable script callbacks if needed - if ($this->server->getGameMode() === 0) { - if (!$this->client->query('GetModeScriptSettings')) { - trigger_error("Couldn't get mode script settings. " . $this->getClientErrorText()); - } - else { - $scriptSettings = $this->client->getResponse(); - if (array_key_exists('S_UseScriptCallbacks', $scriptSettings)) { - $scriptSettings['S_UseScriptCallbacks'] = true; - if (!$this->client->query('SetModeScriptSettings', $scriptSettings)) { - trigger_error("Couldn't set mode script settings to enable script callbacks. " . $this->getClientErrorText()); - } - else { - error_log("Script callbacks successfully enabled."); - } - } - } - } - } -} - -?>