From e60871903da081f39fa65adff19f58dc3d9d5ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Sat, 14 Jun 2014 17:10:19 +0200 Subject: [PATCH] callback name constants --- application/core/Callbacks/CallbackManager.php | 11 ++++++----- application/core/Callbacks/Callbacks.php | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/application/core/Callbacks/CallbackManager.php b/application/core/Callbacks/CallbackManager.php index 7dbfafad..be28971e 100644 --- a/application/core/Callbacks/CallbackManager.php +++ b/application/core/Callbacks/CallbackManager.php @@ -17,7 +17,6 @@ class CallbackManager { * Constants */ // ManiaControl callbacks - // TODO: move into Callbacks interface /** @deprecated Use Callbacks Interface */ const CB_ONINIT = 'Callbacks.OnInit'; /** @deprecated Use Callbacks Interface */ @@ -30,6 +29,8 @@ class CallbackManager { const CB_MP_SERVERSTOP = 'ManiaPlanet.ServerStop'; const CB_MP_BEGINMATCH = 'ManiaPlanet.BeginMatch'; const CB_MP_ENDMATCH = 'ManiaPlanet.EndMatch'; + const CB_MP_BEGINMAP = 'ManiaPlanet.BeginMap'; + const CB_MP_ENDMAP = 'ManiaPlanet.EndMap'; const CB_MP_MAPLISTMODIFIED = 'ManiaPlanet.MapListModified'; const CB_MP_ECHO = 'ManiaPlanet.Echo'; const CB_MP_BILLUPDATED = 'ManiaPlanet.BillUpdated'; @@ -215,17 +216,17 @@ class CallbackManager { private function handleCallback(array $callback) { $callbackName = $callback[0]; switch ($callbackName) { - case 'ManiaPlanet.BeginMatch': + case self::CB_MP_BEGINMATCH: $this->triggerCallback($callbackName, $callback); break; - case 'ManiaPlanet.BeginMap': + case self::CB_MP_BEGINMAP: $this->maniaControl->mapManager->handleBeginMap($callback); $this->triggerCallback($callbackName, $callback); break; - case 'ManiaPlanet.EndMatch': + case self::CB_MP_ENDMATCH: $this->triggerCallback($callbackName, $callback); break; - case 'ManiaPlanet.EndMap': + case self::CB_MP_ENDMAP: $this->maniaControl->mapManager->handleEndMap($callback); $this->triggerCallback($callbackName, $callback); break; diff --git a/application/core/Callbacks/Callbacks.php b/application/core/Callbacks/Callbacks.php index d8008522..b655f900 100644 --- a/application/core/Callbacks/Callbacks.php +++ b/application/core/Callbacks/Callbacks.php @@ -1,8 +1,8 @@