performed code formatting

2014-08-05 02:17:41 +02:00
parent 98b5f132dc
commit 28d2c08936
66 changed files with 4054 additions and 1901 deletions
--- a/application/core/Callbacks/CallbackManager.php
+++ b/application/core/Callbacks/CallbackManager.php
@ -210,7 +210,8 @@ class CallbackManager {
 	 */
 	public function manageCallbacks() {
 		// Manage Timings
-		$this->maniaControl->getTimerManager()->manageTimings();
+		$this->maniaControl->getTimerManager()
+		                   ->manageTimings();

 		// Server Callbacks
 		if (!$this->maniaControl->getClient()) {
@ -218,7 +219,8 @@ class CallbackManager {
 		}

 		// Handle callbacks
-		$callbacks = $this->maniaControl->getClient()->executeCallbacks();
+		$callbacks = $this->maniaControl->getClient()
+		                                ->executeCallbacks();
 		foreach ($callbacks as $callback) {
 			$this->handleCallback($callback);
 		}
@ -236,14 +238,16 @@ class CallbackManager {
 				$this->triggerCallback($callbackName, $callback);
 				break;
 			case self::CB_MP_BEGINMAP:
-				$this->maniaControl->getMapManager()->handleBeginMap($callback);
+				$this->maniaControl->getMapManager()
+				                   ->handleBeginMap($callback);
 				$this->triggerCallback($callbackName, $callback);
 				break;
 			case self::CB_MP_ENDMATCH:
 				$this->triggerCallback($callbackName, $callback);
 				break;
 			case self::CB_MP_ENDMAP:
-				$this->maniaControl->getMapManager()->handleEndMap($callback);
+				$this->maniaControl->getMapManager()
+				                   ->handleEndMap($callback);
 				$this->triggerCallback($callbackName, $callback);
 				break;
 			case self::CB_MP_MODESCRIPTCALLBACK:
--- a/application/core/Callbacks/LibXmlRpcCallbacks.php
+++ b/application/core/Callbacks/LibXmlRpcCallbacks.php
@ -39,79 +39,101 @@ class LibXmlRpcCallbacks implements CallbackListener {
 	public function handleScriptCallback($name, $data) {
 		switch ($name) {
 			case 'LibXmlRpc_BeginMatch':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINMATCH, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINMATCH, $data[0]);
 				break;
 			case 'LibXmlRpc_LoadingMap':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::LOADINGMAP, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::LOADINGMAP, $data[0]);
 				break;
 			case 'BeginMap':
 			case 'LibXmlRpc_BeginMap':
 				if (!isset($data[2])) {
 					$data[2] = 'False';
 				}
-				$this->maniaControl->getMapManager()->handleScriptBeginMap($data[1], $data[2]);
+				$this->maniaControl->getMapManager()
+				                   ->handleScriptBeginMap($data[1], $data[2]);
 				break;
 			case 'LibXmlRpc_BeginSubmatch':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINSUBMATCH, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINSUBMATCH, $data[0]);
 				break;
 			case 'LibXmlRpc_BeginTurn':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINTURN, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINTURN, $data[0]);
 				break;
 			case 'LibXmlRpc_BeginPlaying':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINPLAYING);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINPLAYING);
 				break;
 			case 'LibXmlRpc_EndPlaying':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDPLAYING);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDPLAYING);
 				break;
 			case 'LibXmlRpc_EndTurn':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDTURN, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDTURN, $data[0]);
 				break;
 			case 'LibXmlRpc_EndRound':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDROUND, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDROUND, $data[0]);
 				break;
 			case 'LibXmlRpc_EndSubmatch':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDSUBMATCH, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDSUBMATCH, $data[0]);
 				break;
 			case 'EndMap':
 			case 'LibXmlRpc_EndMap':
-				$this->maniaControl->getMapManager()->handleScriptEndMap();
+				$this->maniaControl->getMapManager()
+				                   ->handleScriptEndMap();
 				break;
 			case 'LibXmlRpc_BeginPodium':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINPODIUM);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINPODIUM);
 				break;
 			case 'LibXmlRpc_EndPodium':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDPODIUM);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDPODIUM);
 				break;
 			case 'LibXmlRpc_UnloadingMap':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::UNLOADINGMAP, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::UNLOADINGMAP, $data[0]);
 				break;
 			case 'LibXmlRpc_EndMatch':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDMATCH, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDMATCH, $data[0]);
 				break;
 			case 'LibXmlRpc_BeginWarmUp':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::BEGINWARMUP);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::BEGINWARMUP);
 				break;
 			case 'LibXmlRpc_EndWarmUp':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ENDWARMUP);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ENDWARMUP);
 				break;
 			case 'LibXmlRpc_PlayerRanking':
 				//TODO really useful? what does it have what RankingsManager not have?
 				$this->triggerPlayerRanking($data[0]);
 				break;
 			case 'LibXmlRpc_OnStartLine':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONSTARTLINE, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ONSTARTLINE, $data[0]);
 				break;
 			case 'LibXmlRpc_OnWayPoint':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONWAYPOINT, $data);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ONWAYPOINT, $data);
 				break;
 			case 'LibXmlRpc_OnGiveUp':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONGIVEUP, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ONGIVEUP, $data[0]);
 				break;
 			case 'LibXmlRpc_OnRespawn':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONRESPAWN, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ONRESPAWN, $data[0]);
 				break;
 			case 'LibXmlRpc_OnStunt':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::ONSTUNT, $data);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::ONSTUNT, $data);
 				break;
 		}
 	}
@ -122,7 +144,9 @@ class LibXmlRpcCallbacks implements CallbackListener {
 	 * @param array $data
 	 */
 	private function triggerPlayerRanking(array $data) {
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($data[1]);
-		$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::PLAYERRANKING, $player, $data[0], $data[6], $data[5]);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($data[1]);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback(Callbacks::PLAYERRANKING, $player, $data[0], $data[6], $data[5]);
 	}
 }
--- a/application/core/Callbacks/ShootManiaCallbacks.php
+++ b/application/core/Callbacks/ShootManiaCallbacks.php
@ -49,16 +49,20 @@ class ShootManiaCallbacks implements CallbackListener {
 	public function handleScriptCallbacks($name, $data) {
 		switch ($name) {
 			case 'LibXmlRpc_Rankings':
-				$this->maniaControl->getServer()->getRankingManager()->updateRankings($data[0]);
+				$this->maniaControl->getServer()
+				                   ->getRankingManager()
+				                   ->updateRankings($data[0]);
 				break;
 			case 'LibXmlRpc_Scores':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::SCORES, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::SCORES, $data[0]);
 				break;
 			case 'LibAFK_IsAFK':
 				$this->triggerAfkStatus($data[0]);
 				break;
 			case 'WarmUp_Status':
-				$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::WARMUPSTATUS, $data[0]);
+				$this->maniaControl->getCallbackManager()
+				                   ->triggerCallback(Callbacks::WARMUPSTATUS, $data[0]);
 				break;
 			case self::CB_TIMEATTACK_ONCHECKPOINT:
 				$this->handleTimeAttackOnCheckpoint($name, $data);
@ -75,8 +79,10 @@ class ShootManiaCallbacks implements CallbackListener {
 	 * @param string $login
 	 */
 	private function triggerAfkStatus($login) {
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
-		$this->maniaControl->getCallbackManager()->triggerCallback(Callbacks::AFKSTATUS, $player);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback(Callbacks::AFKSTATUS, $player);
 	}

 	/**
@ -87,7 +93,8 @@ class ShootManiaCallbacks implements CallbackListener {
 	 */
 	public function handleTimeAttackOnCheckpoint($name, array $data) {
 		$login  = $data[0];
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
 		if (!$player) {
 			return;
 		}
@ -99,7 +106,8 @@ class ShootManiaCallbacks implements CallbackListener {
 		$checkpointCallback->setPlayer($player);
 		$checkpointCallback->time = (int)$data[1];

-		$this->maniaControl->getCallbackManager()->triggerCallback($checkpointCallback);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback($checkpointCallback);
 	}

 	/**
@ -110,7 +118,8 @@ class ShootManiaCallbacks implements CallbackListener {
 	 */
 	public function handleTimeAttackOnFinish($name, array $data) {
 		$login  = $data[0];
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
 		if (!$player) {
 			return;
 		}
@ -122,6 +131,7 @@ class ShootManiaCallbacks implements CallbackListener {
 		$finishCallback->setPlayer($player);
 		$finishCallback->time = (int)$data[1];

-		$this->maniaControl->getCallbackManager()->triggerCallback($finishCallback);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback($finishCallback);
 	}
 }
--- a/application/core/Callbacks/TrackManiaCallbacks.php
+++ b/application/core/Callbacks/TrackManiaCallbacks.php
@ -42,7 +42,8 @@ class TrackManiaCallbacks implements CallbackListener {
 	 */
 	public function handleOnWayPointCallback(array $callback) {
 		$login  = $callback[0];
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
 		if (!$player) {
 			return;
 		}
@ -61,7 +62,8 @@ class TrackManiaCallbacks implements CallbackListener {
 		$wayPointCallback->isEndLap      = Formatter::parseBoolean($callback[7]);

 		if ($wayPointCallback->checkpoint > 0) {
-			$currentMap = $this->maniaControl->getMapManager()->getCurrentMap();
+			$currentMap = $this->maniaControl->getMapManager()
+			                                 ->getCurrentMap();
 			$wayPointCallback->lap += $wayPointCallback->checkpoint / $currentMap->nbCheckpoints;
 		}

@ -73,7 +75,8 @@ class TrackManiaCallbacks implements CallbackListener {
 			$wayPointCallback->name = $wayPointCallback::CHECKPOINT;
 		}

-		$this->maniaControl->getCallbackManager()->triggerCallback($wayPointCallback);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback($wayPointCallback);
 	}

 	/**
@ -84,7 +87,8 @@ class TrackManiaCallbacks implements CallbackListener {
 	public function handlePlayerCheckpointCallback(array $callback) {
 		$data   = $callback[1];
 		$login  = $data[1];
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
 		if (!$player) {
 			return;
 		}
@ -100,7 +104,8 @@ class TrackManiaCallbacks implements CallbackListener {
 		$checkpointCallback->lapCheckpoint = $checkpointCallback->checkpoint;

 		if ($checkpointCallback->lap > 0) {
-			$currentMap = $this->maniaControl->getMapManager()->getCurrentMap();
+			$currentMap = $this->maniaControl->getMapManager()
+			                                 ->getCurrentMap();
 			$checkpointCallback->lapCheckpoint -= $checkpointCallback->lap * $currentMap->nbCheckpoints;
 		}

@ -110,7 +115,8 @@ class TrackManiaCallbacks implements CallbackListener {
 			$checkpointCallback->name = $checkpointCallback::CHECKPOINT;
 		}

-		$this->maniaControl->getCallbackManager()->triggerCallback($checkpointCallback);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback($checkpointCallback);
 	}

 	/**
@ -121,7 +127,8 @@ class TrackManiaCallbacks implements CallbackListener {
 	public function handlePlayerFinishCallback(array $callback) {
 		$data   = $callback[1];
 		$login  = $data[1];
-		$player = $this->maniaControl->getPlayerManager()->getPlayer($login);
+		$player = $this->maniaControl->getPlayerManager()
+		                             ->getPlayer($login);
 		if (!$player) {
 			return;
 		}
@ -134,6 +141,7 @@ class TrackManiaCallbacks implements CallbackListener {
 		$finishCallback->setPlayer($player);
 		$finishCallback->time = (int)$data[2];

-		$this->maniaControl->getCallbackManager()->triggerCallback($finishCallback);
+		$this->maniaControl->getCallbackManager()
+		                   ->triggerCallback($finishCallback);
 	}
 }