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

improved mapmanager

Browse Source
This commit is contained in:
kremsy 2014-01-10 12:22:37 +01:00
parent a925f423a8
commit b37a1ed3b7
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/core/Maps/MapCommands.php
View File

@ -95,7 +95,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
* @param \ManiaControl\Players\Player $player
*/
public function command_RemoveMap(array $chat, Player $player) {
if(!$this->maniaControl->authenticationManager->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) {
if(!$this->maniaControl->authenticationManager->checkPermission($player, MapManager::SETTING_PERMISSION_REMOVE_MAP)) {
$this->maniaControl->authenticationManager->sendNotAllowed($player);
return;
}
@ -105,13 +105,8 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$this->maniaControl->chat->sendError("Couldn't remove map.", $player->login);
return;
}
// Remove map
if(!$this->maniaControl->client->query('RemoveMap', $map->fileName)) {
trigger_error("Couldn't remove current map. " . $this->maniaControl->getClientErrorText());
$this->maniaControl->chat->sendError("Couldn't remove map.", $player->login);
return;
}
$this->maniaControl->chat->sendSuccess('Map removed.', $player->login);
$this->maniaControl->mapManager->removeMap($player, $map);
}
/**

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

@ -687,7 +687,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$this->maniaControl->mapManager->addMapFromMx($mapId, $player->login);
break;
case self::ACTION_ERASE_MAP:
$this->maniaControl->mapManager->removeMap($mapId, $actionArray[3]);
//actionArray[3] = mapUid
$this->maniaControl->mapManager->removeMap($player, $actionArray[3]);
$this->showMapList($player);
break;
case self::ACTION_SWITCH_MAP:

48
application/core/Maps/MapManager.php
View File

@ -7,6 +7,7 @@ use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\FileUtil;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
require_once __DIR__ . '/Map.php';
require_once __DIR__ . '/MapCommands.php';
@ -42,7 +43,6 @@ class MapManager implements CallbackListener {
*/
private $maniaControl = null;
private $maps = array();
private $mapsUids = array();
private $currentMap = null;
/**
@ -137,18 +137,22 @@ class MapManager implements CallbackListener {
/**
* Remove a Map
*
* @param int $id
* @param string $uid
* @param bool $eraseFile
*/
public function removeMap($id, $uid, $eraseFile = false) { //TODO erasefile?
$map = $this->mapsUids[$uid];
$this->maniaControl->client->query('RemoveMap', $map->fileName);
$this->maniaControl->chat->sendSuccess('Map $<' . $map->name . '$> removed!');
// TODO specified message, who done it?
$this->maniaControl->log('Map $<' . $map->name . '$> removed!', true);
unset($this->mapsUids[$uid]);
unset($this->maps[$id]);
public function removeMap(Player $admin, $uid, $eraseFile = false) { //TODO erasefile?
$map = $this->maps[$uid];
// Remove map
if(!$this->maniaControl->client->query('RemoveMap', $map->fileName)) {
trigger_error("Couldn't remove current map. " . $this->maniaControl->getClientErrorText());
$this->maniaControl->chat->sendError("Couldn't remove map.", $admin);
return;
}
$this->maniaControl->chat->sendSuccess('$<' . $admin->nickname . '$> removed $<' . $map->name . '$>');
$this->maniaControl->log('$<' . $admin->nickname . '$> removed $<' . $map->name . '$>', true);
unset($this->maps[$uid]);
}
/**
@ -164,14 +168,13 @@ class MapManager implements CallbackListener {
$maps = $this->maniaControl->client->getResponse();
foreach($maps as $rpcMap) {
if(array_key_exists($rpcMap["UId"], $this->mapsUids)) {
if(array_key_exists($rpcMap["UId"], $this->maps)) {
// Map already exists, only update index
$tempList[] = $this->mapsUids[$rpcMap["UId"]];
$tempList[$rpcMap["UId"]] = $this->maps[$rpcMap["UId"]];
} else { // Insert Map Object
$map = new Map($this->maniaControl, $rpcMap);
$this->saveMap($map);
$tempList[] = $map;
$this->mapsUids[$map->uid] = $map;
$tempList[$map->uid] = $map;
}
}
@ -193,15 +196,14 @@ class MapManager implements CallbackListener {
return false;
}
$rpcMap = $this->maniaControl->client->getResponse();
if(array_key_exists($rpcMap["UId"], $this->mapsUids)) {
$this->currentMap = $this->mapsUids[$rpcMap["UId"]];
if(array_key_exists($rpcMap["UId"], $this->maps)) {
$this->currentMap = $this->maps[$rpcMap["UId"]];
return true;
}
$map = new Map($this->maniaControl, $rpcMap);
$this->saveMap($map);
$this->mapsUids[$map->uid] = $map;
$this->maps[] = $map;
$this->currentMap = $map;
$this->maps[$map->uid] = $map;
$this->currentMap = $map;
return true;
}
@ -232,10 +234,10 @@ class MapManager implements CallbackListener {
* @return mixed
*/
public function getMapByUid($uid) {
if(!isset($this->mapsUids[$uid])) {
if(!isset($this->maps[$uid])) {
return null;
}
return $this->mapsUids[$uid];
return $this->maps[$uid];
}
/**
@ -244,9 +246,9 @@ class MapManager implements CallbackListener {
* @param array $callback
*/
public function handleBeginMap(array $callback) {
if(array_key_exists($callback[1][0]["UId"], $this->mapsUids)) {
if(array_key_exists($callback[1][0]["UId"], $this->maps)) {
// Map already exists, only update index
$this->currentMap = $this->mapsUids[$callback[1][0]["UId"]];
$this->currentMap = $this->maps[$callback[1][0]["UId"]];
} else {
// can this ever happen?
$this->fetchCurrentMap();