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

removed requires to use autoload instead

Browse Source
This commit is contained in:
Steffen Schröder 2014-01-27 09:08:07 +01:00
parent e4fa085940
commit 6850804d61
9 changed files with 103 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Admin/AuthenticationManager.php
View File

@ -8,8 +8,6 @@ use ManiaControl\Players\PlayerManager;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
require_once __DIR__ . '/AuthCommands.php';
/** /**
* Class managing Authentication Levels * Class managing Authentication Levels
* *

5
application/core/Configurators/Configurator.php
View File

@ -19,11 +19,6 @@ use ManiaControl\Manialinks\ManialinkManager;
use ManiaControl\Manialinks\ManialinkPageAnswerListener; use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Players\Player; 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 * Class managing ingame ManiaControl configuration
* *

52
application/core/ManiaControl.php
View File

@ -17,34 +17,13 @@ use ManiaControl\Server\Server;
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__ . '/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__ . '/GbxDataFetcher/gbxdatafetcher.inc.php';
require_once __DIR__ . '/ManiaExchange/mxinfofetcher.inc.php'; require_once __DIR__ . '/ManiaExchange/mxinfofetcher.inc.php';
require_once __DIR__ . '/ManiaExchange/ManiaExchangeManager.php'; require_once __DIR__ . '/ManiaExchange/ManiaExchangeManager.php';
require_once __DIR__ . '/Manialinks/ManialinkManager.php'; require_once __DIR__ . '/FML/autoload.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';
/** /**
* ManiaControl Server Controller for ManiaPlanet Server * ManiaControl Server Controller for ManiaPlanet Server
@ -71,7 +50,9 @@ 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;
@ -84,7 +65,6 @@ class ManiaControl implements CommandListener {
public $statisticManager = null; public $statisticManager = null;
public $updateManager = null; public $updateManager = null;
/** /**
* Private properties * Private properties
*/ */
@ -252,7 +232,8 @@ class ManiaControl implements CommandListener {
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
} }
@ -336,14 +317,16 @@ class ManiaControl implements CommandListener {
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);
} }
@ -353,9 +336,10 @@ class ManiaControl implements CommandListener {
} }
// Set api version // 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 // Connect finished
$this->log("Server Connection successfully established!"); $this->log("Server Connection successfully established!");
@ -370,7 +354,8 @@ class ManiaControl implements CommandListener {
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;
} }
@ -382,7 +367,8 @@ class ManiaControl implements CommandListener {
$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;
} }

5
application/core/Manialinks/ManialinkManager.php
View File

@ -12,11 +12,6 @@ use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; 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 * Manialink manager class
* *

5
application/core/Maps/MapManager.php
View File

@ -11,11 +11,6 @@ use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; 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 * Manager for Maps
* *

6
application/core/Players/PlayerManager.php
View File

@ -8,12 +8,6 @@ use ManiaControl\Formatter;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Statistics\StatisticManager; 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 * Class managing Players
* *

3
application/core/Plugins/PluginManager.php
View File

@ -2,9 +2,6 @@
namespace ManiaControl\Plugins; namespace ManiaControl\Plugins;
require_once __DIR__ . '/Plugin.php';
require_once __DIR__ . '/PluginMenu.php';
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkPageAnswerListener; use ManiaControl\Manialinks\ManialinkPageAnswerListener;

2
application/core/Server/Server.php
View File

@ -9,8 +9,6 @@ use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Structures\SystemInfos; use Maniaplanet\DedicatedServer\Structures\SystemInfos;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
require_once __DIR__ . '/ServerCommands.php';
/** /**
* Class providing Information about theconnected ManiaPlanet Server * Class providing Information about theconnected ManiaPlanet Server
* *

3
application/core/Statistics/StatisticManager.php
View File

@ -5,9 +5,6 @@ namespace ManiaControl\Statistics;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
require_once __DIR__ . '/StatisticCollector.php';
require_once __DIR__ . '/SimpleStatsList.php';
/** /**
* Statistic Manager Class * Statistic Manager Class
* *