nothing serious

application/core/Maps/MapCommands.php

@@ -5,11 +5,8 @@ namespace ManiaControl\Maps;
 use FML\Controls\Quad;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\Controls\Quads\Quad_UIConstruction_Buttons;
-use FML\ManiaLink;
-use FML\Script\EUISound;
 use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
-use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\IconManager;
@@ -25,10 +22,10 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 	/**
 	 * Constants
 	 */
-	const ACTION_OPEN_MAPLIST = 'MapList.OpenMapList';
+	const ACTION_OPEN_MAPLIST = 'MapCommands.OpenMapList';
-	const ACTION_OPEN_XLIST = 'MapList.OpenMXList';
+	const ACTION_OPEN_XLIST   = 'MapCommands.OpenMXList';
-	const ACTION_RESTART_MAP = 'MapList.RestartMap';
+	const ACTION_RESTART_MAP  = 'MapCommands.RestartMap';
-	const ACTION_SKIP_MAP = 'MapList.NextMap';
+	const ACTION_SKIP_MAP     = 'MapCommands.NextMap';
 
 	/**
 	 * Private Properties

application/core/Maps/MapList.php

@@ -78,18 +78,29 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 
 		$params = explode(' ', $chatCallback[1][2]);
 
-		$serverInfo = $this->maniaControl->server->getSystemInfo();
+		$titleId = $this->maniaControl->server->titleId;
-		$title      = strtoupper(substr($serverInfo['TitleId'], 0, 2));
+		$title   = strtoupper(substr($titleId, 0, 2));
 
-		$mapName     = '';
+		$searchString = '';
 		$author       = '';
 		$environment  = '';
 		// TODO also get actual environment
-		$recent = true;
+		$recent = false;
 
-		if(count($params) > 1) {
+		$this->maniaControl->client->query('GetModeScriptInfo');
+		$scriptInfos = $this->maniaControl->client->getResponse();
+
+		//var_dump($scriptInfos);
+		if(count($params) >= 1) {
 			foreach($params as $param) {
-				if($param == '/xlist') {
+				if($param == '/xlist' || $param == MapCommands::ACTION_OPEN_XLIST) {
+					/*	$mapTypes = str_replace($scriptInfos["CompatibleMapTypes"][0]);
+						$mapTypeArray = explode($mapTypes, ",");
+						$searchString = $mapTypeArray[0];
+						var_dump($mapTypes);
+						var_dump($mapTypeArray);
+						//$searchString = str_replace($mapTypeArray[0], '',)
+						var_dump($searchString);*/
 					continue;
 				}
 				if(strtolower(substr($param, 0, 5)) == 'auth:') {
@@ -97,11 +108,12 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				} elseif(strtolower(substr($param, 0, 4)) == 'env:') {
 					$environment = substr($param, 4);
 				} else {
-					if($mapName == '') {
+					if($searchString == '') {
-						$mapName = $param;
+						$searchString = $param;
 					} else { // concatenate words in name
-						$mapName .= '%20' . $param;
+						$searchString .= '%20' . $param;
 					}
+					var_dump("test");
 				}
 			}
 
@@ -109,7 +121,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		}
 
 		// search for matching maps
-		$maps = new MXInfoSearcher($title, $mapName, $author, $environment, $recent);
+		$maps = new MXInfoSearcher($title, $searchString, $author, $environment, $recent);
 
 		// check if there are any results
 		if(!$maps->valid()) {

application/core/Server/Server.php

@@ -4,7 +4,6 @@ namespace ManiaControl\Server;
 
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
-use ManiaControl\FileUtil;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
@@ -145,7 +144,9 @@ class Server implements CallbackListener {
 	 */
 	public function getMapsDirectory() {
 		$dataDirectory = $this->getDataDirectory();
-		if (!$dataDirectory) return null;
+		if(!$dataDirectory) {
+			return null;
+		}
 		return "{$dataDirectory}Maps/";
 	}
 
@@ -156,7 +157,9 @@ class Server implements CallbackListener {
 	 * @return bool
 	 */
 	public function checkAccess($directory) {
-		if (!$directory) return false;
+		if(!$directory) {
+			return false;
+		}
 		return (is_dir($directory) && is_writable($directory));
 	}
 
@@ -168,7 +171,7 @@ class Server implements CallbackListener {
 	 */
 	public function getInfo($detailed = false) {
 		if($detailed) {
-			$login = $this->getLogin();
+			$login = $this->login;
 			if(!$this->maniaControl->client->query('GetDetailedPlayerInfo', $login)) {
 				trigger_error("Couldn't fetch detailed server info. " . $this->maniaControl->getClientErrorText());
 				return null;
@@ -244,8 +247,7 @@ class Server implements CallbackListener {
 	public function getGameMode($stringValue = false, $parseValue = null) {
 		if(is_int($parseValue)) {
 			$gameMode = $parseValue;
-		}
+		} else {
-		else {
 			if(!$this->maniaControl->client->query('GetGameMode')) {
 				trigger_error("Couldn't fetch current game mode. " . $this->maniaControl->getClientErrorText());
 				return null;
@@ -297,7 +299,9 @@ class Server implements CallbackListener {
 	 */
 	public function getGhostReplay(Player $player) {
 		$dataDir = $this->getDataDirectory();
-		if (!$this->checkAccess($dataDir)) return null;
+		if(!$this->checkAccess($dataDir)) {
+			return null;
+		}
 
 		// Build file name
 		$map      = $this->getMap();
@@ -330,7 +334,9 @@ class Server implements CallbackListener {
 		$this->maniaControl->client->query('GetStatus');
 		$response = $this->maniaControl->client->getResponse();
 		// Check if server has the given status
-		if ($response['Code'] === 4) return true;
+		if($response['Code'] === 4) {
+			return true;
+		}
 		// Server not yet in given status - Wait for it...
 		$waitBegin   = time();
 		$maxWaitTime = 20;