From 6850804d614021404628e885a08d711eb51ef28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Mon, 27 Jan 2014 09:08:07 +0100 Subject: [PATCH] removed requires to use autoload instead --- .../core/Admin/AuthenticationManager.php | 2 - .../core/Configurators/Configurator.php | 5 - application/core/ManiaControl.php | 220 ++++++++---------- .../core/Manialinks/ManialinkManager.php | 5 - application/core/Maps/MapManager.php | 5 - application/core/Players/PlayerManager.php | 6 - application/core/Plugins/PluginManager.php | 3 - application/core/Server/Server.php | 2 - .../core/Statistics/StatisticManager.php | 3 - 9 files changed, 103 insertions(+), 148 deletions(-) diff --git a/application/core/Admin/AuthenticationManager.php b/application/core/Admin/AuthenticationManager.php index c8135e7a..abfcb553 100644 --- a/application/core/Admin/AuthenticationManager.php +++ b/application/core/Admin/AuthenticationManager.php @@ -8,8 +8,6 @@ use ManiaControl\Players\PlayerManager; use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackManager; -require_once __DIR__ . '/AuthCommands.php'; - /** * Class managing Authentication Levels * diff --git a/application/core/Configurators/Configurator.php b/application/core/Configurators/Configurator.php index 003fa8f3..f54c46ea 100644 --- a/application/core/Configurators/Configurator.php +++ b/application/core/Configurators/Configurator.php @@ -19,11 +19,6 @@ use ManiaControl\Manialinks\ManialinkManager; use ManiaControl\Manialinks\ManialinkPageAnswerListener; use ManiaControl\Players\Player; -require_once __DIR__ . '/ConfiguratorMenu.php'; -require_once __DIR__ . '/ScriptSettings.php'; -require_once __DIR__ . '/ServerSettings.php'; -require_once __DIR__ . '/ManiaControlSettings.php'; - /** * Class managing ingame ManiaControl configuration * diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index 51f443c1..dc0e66e3 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -17,34 +17,13 @@ use ManiaControl\Server\Server; 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__ . '/Callbacks/CallbackListener.php'; -require_once __DIR__ . '/Commands/CommandListener.php'; -require_once __DIR__ . '/Manialinks/ManialinkPageAnswerListener.php'; -require_once __DIR__ . '/Admin/ActionsMenu.php'; -require_once __DIR__ . '/Admin/AuthenticationManager.php'; -require_once __DIR__ . '/Callbacks/CallbackManager.php'; -require_once __DIR__ . '/Chat.php'; -require_once __DIR__ . '/ColorUtil.php'; -require_once __DIR__ . '/Commands/CommandManager.php'; -require_once __DIR__ . '/Commands/HelpManager.php'; -require_once __DIR__ . '/Configurators/Configurator.php'; -require_once __DIR__ . '/Database.php'; -require_once __DIR__ . '/FileUtil.php'; -require_once __DIR__ . '/Formatter.php'; require_once __DIR__ . '/GbxDataFetcher/gbxdatafetcher.inc.php'; require_once __DIR__ . '/ManiaExchange/mxinfofetcher.inc.php'; require_once __DIR__ . '/ManiaExchange/ManiaExchangeManager.php'; -require_once __DIR__ . '/Manialinks/ManialinkManager.php'; -require_once __DIR__ . '/Statistics/StatisticManager.php'; -require_once __DIR__ . '/Maps/MapManager.php'; -require_once __DIR__ . '/Players/PlayerManager.php'; -require_once __DIR__ . '/Plugins/PluginManager.php'; -require_once __DIR__ . '/Server/Server.php'; -require_once __DIR__ . '/Settings/SettingManager.php'; -require_once __DIR__ . '/UpdateManager.php'; -require_once __DIR__ . '/Server/UsageReporter.php'; +require_once __DIR__ . '/FML/autoload.php'; /** * ManiaControl Server Controller for ManiaPlanet Server @@ -55,13 +34,13 @@ 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 */ @@ -71,7 +50,9 @@ 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; @@ -83,8 +64,7 @@ class ManiaControl implements CommandListener { public $settingManager = null; public $statisticManager = null; public $updateManager = null; - - + /** * Private properties */ @@ -95,27 +75,27 @@ class ManiaControl implements CommandListener { */ public function __construct() { $this->log('Loading ManiaControl v' . self::VERSION . '...'); - + // Load config $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'); $this->commandManager->registerCommandListener('restart', $this, 'command_Restart', true); @@ -129,7 +109,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); @@ -143,15 +123,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; @@ -160,7 +140,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) { @@ -171,11 +151,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; } @@ -185,11 +165,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; } @@ -202,7 +182,7 @@ class ManiaControl implements CommandListener { * @param string $message */ public function quit($message = null) { - if($message) { + if ($message) { $this->log($message); } exit(); @@ -214,16 +194,16 @@ class ManiaControl implements CommandListener { public function handleShutdown() { // OnShutdown callback $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONSHUTDOWN, array(CallbackManager::CB_MC_ONSHUTDOWN)); - + // Announce quit $this->chat->sendInformation('ManiaControl shutting down.'); - + // Hide manialinks $this->client->sendHideManialinkPage(); - - //Close the client connection + + // Close the client connection $this->client->delete($this->server->ip, $this->server->port); - + $this->log('Quitting ManiaControl!'); exit(); } @@ -236,25 +216,26 @@ class ManiaControl implements CommandListener { public function restart($message = null) { // Shutdown callback $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONSHUTDOWN, array(CallbackManager::CB_MC_ONSHUTDOWN)); - + // Announce restart $this->chat->sendInformation('Restarting ManiaControl...'); - if($message) { + if ($message) { $this->log($message); } - + // Hide widgets $this->client->sendHideManialinkPage(); - + $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 + system($command); // TODO, windows stucks here as long controller is running } exit(); } @@ -264,43 +245,43 @@ class ManiaControl implements CommandListener { */ public function run() { $this->log('Starting ManiaControl v' . self::VERSION . '!'); - + // Connect to server $this->connect(); - + // Register shutdown handler register_shutdown_function(array($this, 'handleShutdown')); - + // OnInit callback $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT)); - + // Load plugins $this->pluginManager->loadPlugins(); - + // Announce ManiaControl $this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!'); - + // Loading finished $this->log('Loading completed!'); - + // Main loop - while(!$this->shutdownRequested) { + while (!$this->shutdownRequested) { $loopStart = microtime(true); - + // Disable script timeout set_time_limit(self::SCRIPT_TIMEOUT); - + // Manager callbacks $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); } } - + // Shutdown $this->quit(); } @@ -311,78 +292,83 @@ 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); } - + // 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()); - }*/ - + /* + * 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 $this->log("Server Connection successfully established!"); - + // Hide old widgets $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; } diff --git a/application/core/Manialinks/ManialinkManager.php b/application/core/Manialinks/ManialinkManager.php index 37a13c4e..efb08732 100644 --- a/application/core/Manialinks/ManialinkManager.php +++ b/application/core/Manialinks/ManialinkManager.php @@ -12,11 +12,6 @@ use ManiaControl\ManiaControl; use ManiaControl\Players\Player; use Maniaplanet\DedicatedServer\Xmlrpc\Exception; -require_once __DIR__ . '/StyleManager.php'; -require_once __DIR__ . '/IconManager.php'; -require_once __DIR__ . '/CustomUIManager.php'; -require_once __DIR__ . '/../FML/autoload.php'; - /** * Manialink manager class * diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php index 0efe65a0..defdba31 100644 --- a/application/core/Maps/MapManager.php +++ b/application/core/Maps/MapManager.php @@ -11,11 +11,6 @@ use ManiaControl\ManiaControl; use ManiaControl\Players\Player; use Maniaplanet\DedicatedServer\Xmlrpc\Exception; -require_once __DIR__ . '/Map.php'; -require_once __DIR__ . '/MapCommands.php'; -require_once __DIR__ . '/MapList.php'; -require_once __DIR__ . '/MapQueue.php'; - /** * Manager for Maps * diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php index abc0859a..30e7a311 100644 --- a/application/core/Players/PlayerManager.php +++ b/application/core/Players/PlayerManager.php @@ -8,12 +8,6 @@ use ManiaControl\Formatter; use ManiaControl\ManiaControl; use ManiaControl\Statistics\StatisticManager; -require_once __DIR__ . '/Player.php'; -require_once __DIR__ . '/PlayerActions.php'; -require_once __DIR__ . '/PlayerCommands.php'; -require_once __DIR__ . '/PlayerDetailed.php'; -require_once __DIR__ . '/PlayerList.php'; - /** * Class managing Players * diff --git a/application/core/Plugins/PluginManager.php b/application/core/Plugins/PluginManager.php index 3b59c33d..92d30a0a 100644 --- a/application/core/Plugins/PluginManager.php +++ b/application/core/Plugins/PluginManager.php @@ -2,9 +2,6 @@ namespace ManiaControl\Plugins; -require_once __DIR__ . '/Plugin.php'; -require_once __DIR__ . '/PluginMenu.php'; - use ManiaControl\Callbacks\CallbackListener; use ManiaControl\ManiaControl; use ManiaControl\Manialinks\ManialinkPageAnswerListener; diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php index c6f99bb4..c37a3880 100644 --- a/application/core/Server/Server.php +++ b/application/core/Server/Server.php @@ -9,8 +9,6 @@ use ManiaControl\Players\Player; use Maniaplanet\DedicatedServer\Structures\SystemInfos; use Maniaplanet\DedicatedServer\Xmlrpc\Exception; -require_once __DIR__ . '/ServerCommands.php'; - /** * Class providing Information about theconnected ManiaPlanet Server * diff --git a/application/core/Statistics/StatisticManager.php b/application/core/Statistics/StatisticManager.php index 52611d1a..b84375f2 100644 --- a/application/core/Statistics/StatisticManager.php +++ b/application/core/Statistics/StatisticManager.php @@ -5,9 +5,6 @@ namespace ManiaControl\Statistics; use ManiaControl\ManiaControl; use ManiaControl\Players\Player; -require_once __DIR__ . '/StatisticCollector.php'; -require_once __DIR__ . '/SimpleStatsList.php'; - /** * Statistic Manager Class *