diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php index 29d68833..25ef24f2 100644 --- a/application/core/Admin/ActionsMenu.php +++ b/application/core/Admin/ActionsMenu.php @@ -123,7 +123,6 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener { if(!$this->initCompleted) { return; } - // TODO: Render only once $players = $this->maniaControl->playerManager->getPlayers(); foreach($players as $player) { $manialink = $this->buildMenuIconsManialink($player); diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php index b783d15e..3df2949e 100644 --- a/application/core/Maps/MapList.php +++ b/application/core/Maps/MapList.php @@ -750,7 +750,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { $player = $this->maniaControl->playerManager->getPlayer($login); if($player != null) { if($shown == self::SHOW_MX_LIST) { - //TODO + //nothing to update yet } else if($shown == self::SHOW_MAP_LIST) { $this->showMapList($player); } diff --git a/application/core/Maps/MapQueue.php b/application/core/Maps/MapQueue.php index fde5e0e9..451700da 100644 --- a/application/core/Maps/MapQueue.php +++ b/application/core/Maps/MapQueue.php @@ -1,6 +1,7 @@ maniaControl = $maniaControl; - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this,'endMap'); + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this, 'endMap'); // Init settings $this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE, true); @@ -52,17 +53,18 @@ class MapQueue implements CallbackListener, CommandListener { /** * Clears the map-queue via admin command clearmap queue + * * @param array $chat * @param Player $player */ - public function command_ClearMapQueue(array $chat, Player $admin){ + public function command_ClearMapQueue(array $chat, Player $admin) { $title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel); //Destroy map - queue list $this->queuedMaps = array(); $this->maniaControl->chat->sendInformation($title . ' $<' . $admin->nickname . '$> cleared the Queued-Map list!'); - $this->maniaControl->log($title .' ' . Formatter::stripCodes($admin->nickname) . ' cleared the Queued-Map list!'); + $this->maniaControl->log($title . ' ' . Formatter::stripCodes($admin->nickname) . ' cleared the Queued-Map list!'); // Trigger callback $this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear')); @@ -70,14 +72,15 @@ class MapQueue implements CallbackListener, CommandListener { /** * Adds a Map to the map-queue + * * @param $login * @param $uid */ - public function addMapToMapQueue($login, $uid){ //TODO if from MX other message + public function addMapToMapQueue($login, $uid) { $player = $this->maniaControl->playerManager->getPlayer($login); //Check if the map is already juked - if(array_key_exists($uid, $this->queuedMaps)){ + if(array_key_exists($uid, $this->queuedMaps)) { $this->maniaControl->chat->sendError('Map is already in the Map-Queue', $login); return; } @@ -97,34 +100,36 @@ class MapQueue implements CallbackListener, CommandListener { /** * Revmoes a Map from the Map queue + * * @param $login * @param $uid */ - public function removeFromMapQueue($login, $uid){ + public function removeFromMapQueue($login, $uid) { unset($this->queuedMaps[$uid]); } /** * Called on endmap + * * @param array $callback */ - public function endMap(array $callback){ + public function endMap(array $callback) { $this->nextMap = null; - if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE) == TRUE){ + if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE) == TRUE) { //Skip Map if requester has left - foreach($this->queuedMaps as $queuedMap){ + foreach($this->queuedMaps as $queuedMap) { $player = $queuedMap[0]; //found player, so play this map - if($this->maniaControl->playerManager->getPlayer($player->login) != null){ + if($this->maniaControl->playerManager->getPlayer($player->login) != null) { break; } - if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAPQUEUE_ADMIN) == FALSE){ + if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAPQUEUE_ADMIN) == FALSE) { //Check if the queuer is a admin - if($player->authLevel > 0){ + if($player->authLevel > 0) { break; } } @@ -142,13 +147,14 @@ class MapQueue implements CallbackListener, CommandListener { $this->nextMap = array_shift($this->queuedMaps); //Check if Map Queue is empty - if($this->nextMap == null) + if($this->nextMap == null) { return; + } $map = $this->nextMap[1]; $success = $this->maniaControl->client->query('ChooseNextMap', $map->fileName); - if (!$success) { + if(!$success) { trigger_error('[' . $this->maniaControl->client->getErrorCode() . '] ChooseNextMap - ' . $this->maniaControl->client->getErrorCode(), E_USER_WARNING); return; } @@ -156,20 +162,23 @@ class MapQueue implements CallbackListener, CommandListener { /** * Returns the next Map if the next map is a queuedmap or null if it's not + * * @return null */ - public function getNextMap(){ + public function getNextMap() { return $this->nextMap; } + /** * Returns a list with the indexes of the queued maps + * * @return array */ - public function getQueuedMapsRanking(){ - $i = 1; + public function getQueuedMapsRanking() { + $i = 1; $queuedMaps = array(); - foreach($this->queuedMaps as $map){ - $map = $map[1]; + foreach($this->queuedMaps as $map) { + $map = $map[1]; $queuedMaps[$map->uid] = $i; $i++; } @@ -179,8 +188,8 @@ class MapQueue implements CallbackListener, CommandListener { /** * Dummy Function for testing */ - public function printAllMaps(){ - foreach($this->queuedMaps as $map){ + public function printAllMaps() { + foreach($this->queuedMaps as $map) { $map = $map[1]; var_dump($map->name); } diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php index 2b55f2c6..b229d631 100644 --- a/application/core/Settings/SettingManager.php +++ b/application/core/Settings/SettingManager.php @@ -17,7 +17,6 @@ class SettingManager { const TYPE_REAL = 'real'; const TYPE_BOOL = 'bool'; const TYPE_ARRAY = 'array'; - //const TYPE_AUTH_LEVEL = 'auth'; //TODO /** * Private properties diff --git a/application/core/Statistics/StatisticCollector.php b/application/core/Statistics/StatisticCollector.php index 81c17008..7113647a 100644 --- a/application/core/Statistics/StatisticCollector.php +++ b/application/core/Statistics/StatisticCollector.php @@ -56,7 +56,7 @@ class StatisticCollector implements CallbackListener { //Initialize Settings $this->maniaControl->settingManager->initSetting($this, self::SETTING_COLLECT_STATS_ENABLED, true); - $this->maniaControl->settingManager->initSetting($this, self::SETTING_COLLECT_STATS_MINPLAYERS, 1); //TODO TEMP on 1, normally 3 or 4 + $this->maniaControl->settingManager->initSetting($this, self::SETTING_COLLECT_STATS_MINPLAYERS, 3); $this->maniaControl->settingManager->initSetting($this, self::SETTING_ON_SHOOT_PRESTORE, 30); }