From db255fe1c014f66edea9dc1fc355157b3d9179a9 Mon Sep 17 00:00:00 2001 From: kremsy Date: Wed, 19 Feb 2014 12:53:06 +0100 Subject: [PATCH] cb names updated --- .../core/Admin/AuthenticationManager.php | 2 +- .../core/Callbacks/CallbackManager.php | 22 ++++++++++--------- application/core/Commands/HelpManager.php | 2 +- .../core/Configurators/ScriptSettings.php | 2 +- .../core/Configurators/ServerSettings.php | 2 +- application/core/ManiaControl.php | 8 +++---- application/core/Maps/MapManager.php | 4 ++-- application/core/Maps/MapQueue.php | 2 +- application/core/Players/PlayerManager.php | 2 +- application/core/Server/RankingManager.php | 2 +- application/core/Server/Server.php | 2 +- application/core/Server/ServerCommands.php | 2 +- application/core/Settings/SettingManager.php | 2 +- .../core/Statistics/SimpleStatsList.php | 2 +- .../core/Statistics/StatisticCollector.php | 2 +- application/plugins/Endurance.php | 4 ++-- application/plugins/Karma.php | 2 +- application/plugins/LocalRecords.php | 6 ++--- application/plugins/ServerRanking.php | 2 +- application/plugins/WidgetPlugin.php | 4 ++-- 20 files changed, 39 insertions(+), 37 deletions(-) diff --git a/application/core/Admin/AuthenticationManager.php b/application/core/Admin/AuthenticationManager.php index 5f071210..819cf680 100644 --- a/application/core/Admin/AuthenticationManager.php +++ b/application/core/Admin/AuthenticationManager.php @@ -43,7 +43,7 @@ class AuthenticationManager implements CallbackListener { $this->maniaControl = $maniaControl; $this->authCommands = new AuthCommands($maniaControl); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); } public function handleOnInit(array $callback) { diff --git a/application/core/Callbacks/CallbackManager.php b/application/core/Callbacks/CallbackManager.php index 50724d99..294238de 100644 --- a/application/core/Callbacks/CallbackManager.php +++ b/application/core/Callbacks/CallbackManager.php @@ -14,12 +14,13 @@ class CallbackManager { * Constants */ // ManiaControl callbacks - const CB_MC_ONINIT = 'ManiaControl.OnInit'; - const CB_MC_AFTERINIT = 'ManiaControl.AfterInit'; - const CB_MC_ONSHUTDOWN = 'ManiaControl.OnShutdown'; - const CB_MC_CLIENTUPDATED = 'ManiaControl.ClientUpdated'; - const CB_MC_BEGINMAP = 'ManiaControl.BeginMap'; - const CB_MC_ENDMAP = 'ManiaControl.EndMap'; + const CB_ONINIT = 'ManiaControl.OnInit'; + const CB_AFTERINIT = 'ManiaControl.AfterInit'; + const CB_ONSHUTDOWN = 'ManiaControl.OnShutdown'; + const CB_CLIENTUPDATED = 'ManiaControl.ClientUpdated'; + const CB_BEGINMAP = 'ManiaControl.BeginMap'; + const CB_ENDMAP = 'ManiaControl.EndMap'; + // ManiaPlanet callbacks const CB_MP_SERVERSTART = 'ManiaPlanet.ServerStart'; const CB_MP_SERVERSTOP = 'ManiaPlanet.ServerStop'; @@ -39,6 +40,7 @@ class CallbackManager { const CB_MP_MODESCRIPTCALLBACK = 'ManiaPlanet.ModeScriptCallback'; const CB_MP_MODESCRIPTCALLBACKARRAY = 'ManiaPlanet.ModeScriptCallbackArray'; const CB_MP_TUNNELDATARECEIVED = 'ManiaPlanet.TunnelDataReceived'; + // TrackMania callbacks const CB_TM_PLAYERCHECKPOINT = 'TrackMania.PlayerCheckpoint'; const CB_TM_PLAYERFINISH = 'TrackMania.PlayerFinish'; @@ -199,14 +201,14 @@ class CallbackManager { switch($callbackName) { case 'ManiaPlanet.BeginMap': if (!$this->mapBegan) { - $this->triggerCallback(self::CB_MC_BEGINMAP, $callback); + $this->triggerCallback(self::CB_BEGINMAP, $callback); $this->mapBegan = true; $this->mapEnded = false; } break; case 'ManiaPlanet.EndMap': if (!$this->mapEnded) { - $this->triggerCallback(self::CB_MC_ENDMAP, $callback); + $this->triggerCallback(self::CB_ENDMAP, $callback); $this->mapEnded = true; $this->mapBegan = false; } @@ -239,7 +241,7 @@ class CallbackManager { case 'LibXmlRpc_BeginMap': $this->triggerScriptCallback($scriptCallbackName, $scriptCallbackData); if (!$this->mapBegan) { - $this->triggerCallback(self::CB_MC_BEGINMAP, $callback); + $this->triggerCallback(self::CB_BEGINMAP, $callback); $this->mapBegan = true; $this->mapEnded = false; } @@ -248,7 +250,7 @@ class CallbackManager { case 'LibXmlRpc_EndMap': $this->triggerScriptCallback($scriptCallbackName, $scriptCallbackData); if (!$this->mapEnded) { - $this->triggerCallback(self::CB_MC_ENDMAP, $callback); + $this->triggerCallback(self::CB_ENDMAP, $callback); $this->mapEnded = true; $this->mapBegan = false; } diff --git a/application/core/Commands/HelpManager.php b/application/core/Commands/HelpManager.php index 1d42b7fc..41d28262 100644 --- a/application/core/Commands/HelpManager.php +++ b/application/core/Commands/HelpManager.php @@ -29,7 +29,7 @@ class HelpManager implements CommandListener, CallbackListener { $this->maniaControl = $maniaControl; // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); } public function handleOnInit(array $callback) { diff --git a/application/core/Configurators/ScriptSettings.php b/application/core/Configurators/ScriptSettings.php index 003ecdb8..8a91d707 100644 --- a/application/core/Configurators/ScriptSettings.php +++ b/application/core/Configurators/ScriptSettings.php @@ -47,7 +47,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener { // Register for callbacks $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(MapManager::CB_BEGINMAP, $this, 'onBeginMap'); $this->maniaControl->settingManager->initSetting($this, self::SETTING_LOAD_DEFAULT_SETTINGS_MAP_BEGIN, true); $this->initTables(); diff --git a/application/core/Configurators/ServerSettings.php b/application/core/Configurators/ServerSettings.php index 0d7c3e0b..60feb9a5 100644 --- a/application/core/Configurators/ServerSettings.php +++ b/application/core/Configurators/ServerSettings.php @@ -46,7 +46,7 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener { // Register for callbacks $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); } /** diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php index b2a85bf7..4e2baacf 100644 --- a/application/core/ManiaControl.php +++ b/application/core/ManiaControl.php @@ -214,7 +214,7 @@ class ManiaControl implements CommandListener { */ public function handleShutdown() { // OnShutdown callback - $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONSHUTDOWN, array(CallbackManager::CB_MC_ONSHUTDOWN)); + $this->callbackManager->triggerCallback(CallbackManager::CB_ONSHUTDOWN, array(CallbackManager::CB_ONSHUTDOWN)); // Announce quit $this->chat->sendInformation('ManiaControl shutting down.'); @@ -245,7 +245,7 @@ class ManiaControl implements CommandListener { */ public function restart($message = null) { // Shutdown callback - $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONSHUTDOWN, array(CallbackManager::CB_MC_ONSHUTDOWN)); + $this->callbackManager->triggerCallback(CallbackManager::CB_ONSHUTDOWN, array(CallbackManager::CB_ONSHUTDOWN)); // Announce restart $this->chat->sendInformation('Restarting ManiaControl...'); @@ -282,13 +282,13 @@ class ManiaControl implements CommandListener { $this->connect(); // OnInit callback - $this->callbackManager->triggerCallback(CallbackManager::CB_MC_ONINIT, array(CallbackManager::CB_MC_ONINIT)); + $this->callbackManager->triggerCallback(CallbackManager::CB_ONINIT, array(CallbackManager::CB_ONINIT)); // Load plugins $this->pluginManager->loadPlugins(); // AfterInit callback - $this->callbackManager->triggerCallback(CallbackManager::CB_MC_AFTERINIT, array(CallbackManager::CB_MC_AFTERINIT)); + $this->callbackManager->triggerCallback(CallbackManager::CB_AFTERINIT, array(CallbackManager::CB_AFTERINIT)); // Announce ManiaControl $this->chat->sendInformation('ManiaControl v' . self::VERSION . ' successfully started!'); diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php index 82c4fd37..8bd3adfc 100644 --- a/application/core/Maps/MapManager.php +++ b/application/core/Maps/MapManager.php @@ -69,8 +69,8 @@ class MapManager implements CallbackListener { $this->mapQueue = new MapQueue($this->maniaControl); // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_BEGINMAP, $this, 'handleBeginMap'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified'); //Define Rights diff --git a/application/core/Maps/MapQueue.php b/application/core/Maps/MapQueue.php index 40b90285..4acb2064 100644 --- a/application/core/Maps/MapQueue.php +++ b/application/core/Maps/MapQueue.php @@ -42,7 +42,7 @@ class MapQueue implements CallbackListener, CommandListener { public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this, 'endMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ENDMAP, $this, 'endMap'); // Init settings $this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE, true); diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php index 28a8470f..a559607a 100644 --- a/application/core/Players/PlayerManager.php +++ b/application/core/Players/PlayerManager.php @@ -61,7 +61,7 @@ class PlayerManager implements CallbackListener { $this->maniaControl->settingManager->initSetting($this, self::SETTING_JOIN_LEAVE_MESSAGES, true); // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, 'playerConnect'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERDISCONNECT, $this, 'playerDisconnect'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERINFOCHANGED, $this, 'playerInfoChanged'); diff --git a/application/core/Server/RankingManager.php b/application/core/Server/RankingManager.php index efe8b485..2a1ded5c 100644 --- a/application/core/Server/RankingManager.php +++ b/application/core/Server/RankingManager.php @@ -35,7 +35,7 @@ class RankingManager implements CallbackListener { //Register Callbacks $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACK, $this, 'handleCallbacks'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACKARRAY, $this, 'handleCallbacks'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); //TODO won message at end of the map (disable as setting) } diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php index c9a501b3..aae603f3 100644 --- a/application/core/Server/Server.php +++ b/application/core/Server/Server.php @@ -58,7 +58,7 @@ class Server implements CallbackListener { $this->rankingManager = new RankingManager($maniaControl); // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); } /** diff --git a/application/core/Server/ServerCommands.php b/application/core/Server/ServerCommands.php index 256535ac..ca9d4b79 100644 --- a/application/core/Server/ServerCommands.php +++ b/application/core/Server/ServerCommands.php @@ -53,7 +53,7 @@ class ServerCommands implements CallbackListener, CommandListener, ManialinkPage // Register for callbacks $this->maniaControl->timerManager->registerTimerListening($this, 'each5Seconds', 5000); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); // Register for commands $this->maniaControl->commandManager->registerCommandListener('setpwd', $this, 'command_SetPwd', true); diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index 0906373e..e8c4c62d 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -38,7 +38,7 @@ class SettingManager implements CallbackListener { $this->maniaControl = $maniaControl; $this->initTables(); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_AFTERINIT, $this, 'handleAfterInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit'); } /** diff --git a/application/core/Statistics/SimpleStatsList.php b/application/core/Statistics/SimpleStatsList.php index 53af9331..7d9cca6b 100644 --- a/application/core/Statistics/SimpleStatsList.php +++ b/application/core/Statistics/SimpleStatsList.php @@ -46,7 +46,7 @@ class SimpleStatsList implements ManialinkPageAnswerListener, CallbackListener, $this->maniaControl = $maniaControl; $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); } /** diff --git a/application/core/Statistics/StatisticCollector.php b/application/core/Statistics/StatisticCollector.php index f0948fbd..d34d15f4 100644 --- a/application/core/Statistics/StatisticCollector.php +++ b/application/core/Statistics/StatisticCollector.php @@ -66,7 +66,7 @@ class StatisticCollector implements CallbackListener { //Register Callbacks $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACK, $this, 'handleCallbacks'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MODESCRIPTCALLBACKARRAY, $this, 'handleCallbacks'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'onInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'onInit'); $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECT, $this, 'onPlayerDisconnect'); //Initialize Settings diff --git a/application/plugins/Endurance.php b/application/plugins/Endurance.php index a2da4958..4048d01f 100644 --- a/application/plugins/Endurance.php +++ b/application/plugins/Endurance.php @@ -45,8 +45,8 @@ class EndurancePlugin implements CallbackListener, Plugin { $this->maniaControl = $maniaControl; // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'callback_OnInit'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'callback_BeginMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'callback_OnInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_BEGINMAP, $this, 'callback_BeginMap'); $this->maniaControl->callbackManager->registerScriptCallbackListener(self::CB_CHECKPOINT, $this, 'callback_Checkpoint'); return true; diff --git a/application/plugins/Karma.php b/application/plugins/Karma.php index 8ba3f7ba..4992cdee 100644 --- a/application/plugins/Karma.php +++ b/application/plugins/Karma.php @@ -76,7 +76,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin { // Register for callbacks $this->maniaControl->timerManager->registerTimerListening($this, 'handle1Second', 1000); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_BEGINMAP, $this, 'handleBeginMap'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, 'handlePlayerConnect'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCHAT, $this, 'handlePlayerChat'); diff --git a/application/plugins/LocalRecords.php b/application/plugins/LocalRecords.php index a39d64b5..33f97b85 100644 --- a/application/plugins/LocalRecords.php +++ b/application/plugins/LocalRecords.php @@ -78,9 +78,9 @@ class LocalRecordsPlugin implements CallbackListener, TimerListener, Plugin { // Register for callbacks $this->maniaControl->timerManager->registerTimerListening($this, 'handle1Second', 1000); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_AFTERINIT, $this, 'handleAfterInit'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleMapBegin'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_CLIENTUPDATED, $this, + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_BEGINMAP, $this, 'handleMapBegin'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_CLIENTUPDATED, $this, 'handleClientUpdated'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_TM_PLAYERFINISH, $this, 'handlePlayerFinish'); diff --git a/application/plugins/ServerRanking.php b/application/plugins/ServerRanking.php index e2b73aec..4027ecf4 100644 --- a/application/plugins/ServerRanking.php +++ b/application/plugins/ServerRanking.php @@ -84,7 +84,7 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener { //Register CallbackListeners $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerConnect'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this, 'handleEndMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ENDMAP, $this, 'handleEndMap'); //Register CommandListener $this->maniaControl->commandManager->registerCommandListener('rank', $this, 'command_showRank', false); diff --git a/application/plugins/WidgetPlugin.php b/application/plugins/WidgetPlugin.php index a09a275c..e6bfd28e 100644 --- a/application/plugins/WidgetPlugin.php +++ b/application/plugins/WidgetPlugin.php @@ -95,8 +95,8 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin { $this->maniaControl->manialinkManager->customUIManager->setChallengeInfoVisible(false); // Register for callbacks - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleOnBeginMap'); - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this, 'handleOnEndMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_BEGINMAP, $this, 'handleOnBeginMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ENDMAP, $this, 'handleOnEndMap'); $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'handlePlayerConnect'); $this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECT, $this, 'handlePlayerDisconnect');