beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

removed some resolved todos

Browse Source
This commit is contained in:
kremsy
2014-01-14 18:27:54 +01:00
committed by Steffen Schröder
parent 145f612a2f
commit 41dabc21a3
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/core/Admin/ActionsMenu.php
View File

@@ -123,7 +123,6 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
if(!$this->initCompleted) { if(!$this->initCompleted) {
return; return;
} }
// TODO: Render only once
$players = $this->maniaControl->playerManager->getPlayers(); $players = $this->maniaControl->playerManager->getPlayers();
foreach($players as $player) { foreach($players as $player) {
$manialink = $this->buildMenuIconsManialink($player); $manialink = $this->buildMenuIconsManialink($player);

2
application/core/Maps/MapList.php
View File

@@ -750,7 +750,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$player = $this->maniaControl->playerManager->getPlayer($login); $player = $this->maniaControl->playerManager->getPlayer($login);
if($player != null) { if($player != null) {
if($shown == self::SHOW_MX_LIST) { if($shown == self::SHOW_MX_LIST) {
//TODO //nothing to update yet
} else if($shown == self::SHOW_MAP_LIST) { } else if($shown == self::SHOW_MAP_LIST) {
$this->showMapList($player); $this->showMapList($player);
} }

47
application/core/Maps/MapQueue.php
View File

@@ -1,6 +1,7 @@
<?php <?php
namespace ManiaControl\Maps; namespace ManiaControl\Maps;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Commands\CommandListener; use ManiaControl\Commands\CommandListener;
@@ -39,7 +40,7 @@ class MapQueue implements CallbackListener, CommandListener {
public function __construct(ManiaControl $maniaControl) { public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl; $this->maniaControl = $maniaControl;
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this,'endMap'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ENDMAP, $this, 'endMap');
// Init settings // Init settings
$this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE, true); $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 * Clears the map-queue via admin command clearmap queue
*
* @param array $chat * @param array $chat
* @param Player $player * @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); $title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
//Destroy map - queue list //Destroy map - queue list
$this->queuedMaps = array(); $this->queuedMaps = array();
$this->maniaControl->chat->sendInformation($title . ' $<' . $admin->nickname . '$> cleared the Queued-Map list!'); $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 // Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear')); $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 * Adds a Map to the map-queue
*
* @param $login * @param $login
* @param $uid * @param $uid
*/ */
public function addMapToMapQueue($login, $uid){ //TODO if from MX other message public function addMapToMapQueue($login, $uid) {
$player = $this->maniaControl->playerManager->getPlayer($login); $player = $this->maniaControl->playerManager->getPlayer($login);
//Check if the map is already juked //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); $this->maniaControl->chat->sendError('Map is already in the Map-Queue', $login);
return; return;
} }
@@ -97,34 +100,36 @@ class MapQueue implements CallbackListener, CommandListener {
/** /**
* Revmoes a Map from the Map queue * Revmoes a Map from the Map queue
*
* @param $login * @param $login
* @param $uid * @param $uid
*/ */
public function removeFromMapQueue($login, $uid){ public function removeFromMapQueue($login, $uid) {
unset($this->queuedMaps[$uid]); unset($this->queuedMaps[$uid]);
} }
/** /**
* Called on endmap * Called on endmap
*
* @param array $callback * @param array $callback
*/ */
public function endMap(array $callback){ public function endMap(array $callback) {
$this->nextMap = null; $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 //Skip Map if requester has left
foreach($this->queuedMaps as $queuedMap){ foreach($this->queuedMaps as $queuedMap) {
$player = $queuedMap[0]; $player = $queuedMap[0];
//found player, so play this map //found player, so play this map
if($this->maniaControl->playerManager->getPlayer($player->login) != null){ if($this->maniaControl->playerManager->getPlayer($player->login) != null) {
break; 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 //Check if the queuer is a admin
if($player->authLevel > 0){ if($player->authLevel > 0) {
break; break;
} }
} }
@@ -142,13 +147,14 @@ class MapQueue implements CallbackListener, CommandListener {
$this->nextMap = array_shift($this->queuedMaps); $this->nextMap = array_shift($this->queuedMaps);
//Check if Map Queue is empty //Check if Map Queue is empty
if($this->nextMap == null) if($this->nextMap == null) {
return; return;
}
$map = $this->nextMap[1]; $map = $this->nextMap[1];
$success = $this->maniaControl->client->query('ChooseNextMap', $map->fileName); $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); trigger_error('[' . $this->maniaControl->client->getErrorCode() . '] ChooseNextMap - ' . $this->maniaControl->client->getErrorCode(), E_USER_WARNING);
return; return;
} }
@@ -156,19 +162,22 @@ class MapQueue implements CallbackListener, CommandListener {
/** /**
* Returns the next Map if the next map is a queuedmap or null if it's not * Returns the next Map if the next map is a queuedmap or null if it's not
*
* @return null * @return null
*/ */
public function getNextMap(){ public function getNextMap() {
return $this->nextMap; return $this->nextMap;
} }
/** /**
* Returns a list with the indexes of the queued maps * Returns a list with the indexes of the queued maps
*
* @return array * @return array
*/ */
public function getQueuedMapsRanking(){ public function getQueuedMapsRanking() {
$i = 1; $i = 1;
$queuedMaps = array(); $queuedMaps = array();
foreach($this->queuedMaps as $map){ foreach($this->queuedMaps as $map) {
$map = $map[1]; $map = $map[1];
$queuedMaps[$map->uid] = $i; $queuedMaps[$map->uid] = $i;
$i++; $i++;
@@ -179,8 +188,8 @@ class MapQueue implements CallbackListener, CommandListener {
/** /**
* Dummy Function for testing * Dummy Function for testing
*/ */
public function printAllMaps(){ public function printAllMaps() {
foreach($this->queuedMaps as $map){ foreach($this->queuedMaps as $map) {
$map = $map[1]; $map = $map[1];
var_dump($map->name); var_dump($map->name);
} }

1
application/core/Settings/SettingManager.php
View File

@@ -17,7 +17,6 @@ class SettingManager {
const TYPE_REAL = 'real'; const TYPE_REAL = 'real';
const TYPE_BOOL = 'bool'; const TYPE_BOOL = 'bool';
const TYPE_ARRAY = 'array'; const TYPE_ARRAY = 'array';
//const TYPE_AUTH_LEVEL = 'auth'; //TODO
/** /**
* Private properties * Private properties

2
application/core/Statistics/StatisticCollector.php
View File

@@ -56,7 +56,7 @@ class StatisticCollector implements CallbackListener {
//Initialize Settings //Initialize Settings
$this->maniaControl->settingManager->initSetting($this, self::SETTING_COLLECT_STATS_ENABLED, true); $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); $this->maniaControl->settingManager->initSetting($this, self::SETTING_ON_SHOOT_PRESTORE, 30);
} }