From 51f8fd8e2205945c28532f0e9b3bf3d5422bef37 Mon Sep 17 00:00:00 2001
From: Max Klaversma <maxklaversma@gmail.com>
Date: Sat, 19 Apr 2014 13:04:30 +0200
Subject: [PATCH] Made update to make sure not to timeout on MX request onInit

---
 application/core/Maps/MapManager.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 7d0e9ae5..8427e8e7 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -79,6 +79,7 @@ class MapManager implements CallbackListener {
 		
 		// Register for callbacks
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit');
+		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit');
 		$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified');
 		
 		// Define Rights
@@ -353,7 +354,7 @@ class MapManager implements CallbackListener {
 		$map = new Map($rpcMap);
 		$this->saveMap($map);
 		
-		$mapsDirectory = $this->maniaControl->server->getMapsDirectory();
+		/*$mapsDirectory = $this->maniaControl->server->getMapsDirectory();
 		if (is_readable($mapsDirectory . $map->fileName)) {
 			$mapFetcher = new \GBXChallMapFetcher(true);
 			$mapFetcher->processFile($mapsDirectory . $map->fileName);
@@ -361,7 +362,7 @@ class MapManager implements CallbackListener {
 			$map->authorEInfo = $mapFetcher->authorEInfo;
 			$map->authorZone = $mapFetcher->authorZone;
 			$map->comment = $mapFetcher->comment;
-		}
+		}*/
 		return $map;
 	}
 
@@ -369,9 +370,8 @@ class MapManager implements CallbackListener {
 	 * Updates the full Map list, needed on Init, addMap and on ShuffleMaps
 	 */
 	private function updateFullMapList() {
-		$maps = $this->maniaControl->client->getMapList(100, 0);
+		$maps = $this->maniaControl->client->getMapList(1000, 0);
 		$tempList = array();
-		
 		foreach ($maps as $rpcMap) {
 			if (array_key_exists($rpcMap->uId, $this->maps)) {
 				// Map already exists, only update index
@@ -432,13 +432,18 @@ class MapManager implements CallbackListener {
 		$this->updateFullMapList();
 		$this->fetchCurrentMap();
 		
-		// Fetch Mx Infos
-		$this->mxManager->fetchManiaExchangeMapInformations();
-		
 		// Restructure Maplist
 		$this->restructureMapList();
 	}
 
+	/**
+	 * Handle AfterInit callback
+	 */
+	public function handleAfterInit() {
+		// Fetch MX infos
+		$this->mxManager->fetchManiaExchangeMapInformations();
+	}
+
 	/**
 	 * Get Current Map
 	 *