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

prevent navigation out of maps directory

Browse Source
This commit is contained in:
steeffeen 2014-07-05 12:06:49 +02:00
parent a91049c293
commit d5cfa925b2
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
application/core/Maps/DirectoryBrowser.php
View File

@ -80,16 +80,33 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
* @param mixed $nextFolder * @param mixed $nextFolder
*/ */
public function showManiaLink(Player $player, $nextFolder = null) { public function showManiaLink(Player $player, $nextFolder = null) {
$oldFolderPath = $player->getCache($this, self::CACHE_FOLDER_PATH); $oldFolderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
$isInMapsFolder = false;
if (!$oldFolderPath) { if (!$oldFolderPath) {
$oldFolderPath = $this->maniaControl->server->directory->getMapsFolder(); $oldFolderPath = $this->maniaControl->server->directory->getMapsFolder();
$isInMapsFolder = true;
} }
$folderPath = $oldFolderPath; $folderPath = $oldFolderPath;
if (is_string($nextFolder)) { if (is_string($nextFolder)) {
$newFolderPath = $oldFolderPath . $nextFolder . DIRECTORY_SEPARATOR; $newFolderPath = realpath($oldFolderPath . $nextFolder);
$realPath = realpath($newFolderPath); if ($newFolderPath) {
if ($realPath) { $folderPath = $newFolderPath . DIRECTORY_SEPARATOR;
$folderPath = $realPath . DIRECTORY_SEPARATOR; $folderName = basename($newFolderPath);
switch ($folderName) {
case 'Maps':
$mapsDir = dirname($this->maniaControl->server->directory->getMapsFolder());
$folderDir = dirname($folderPath);
$isInMapsFolder = ($mapsDir === $folderDir);
break;
case 'UserData':
$dataDir = dirname($this->maniaControl->server->directory->getGameDataFolder());
$folderDir = dirname($folderPath);
if ($dataDir === $folderDir) {
// Prevent navigation out of maps directory
return;
}
break;
}
} }
} }
$player->setCache($this, self::CACHE_FOLDER_PATH, $folderPath); $player->setCache($this, self::CACHE_FOLDER_PATH, $folderPath);
@ -111,15 +128,18 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$frame->add($navigateRootQuad); $frame->add($navigateRootQuad);
$navigateRootQuad->setPosition($width * -0.47, $height * 0.45) $navigateRootQuad->setPosition($width * -0.47, $height * 0.45)
->setSize(4, 4) ->setSize(4, 4)
->setSubStyle($navigateRootQuad::SUBSTYLE_ToolRoot) ->setSubStyle($navigateRootQuad::SUBSTYLE_ToolRoot);
->setAction(self::ACTION_NAVIGATE_ROOT);
$navigateUpQuad = new Quad_Icons64x64_1(); $navigateUpQuad = new Quad_Icons64x64_1();
$frame->add($navigateUpQuad); $frame->add($navigateUpQuad);
$navigateUpQuad->setPosition($width * -0.44, $height * 0.45) $navigateUpQuad->setPosition($width * -0.44, $height * 0.45)
->setSize(4, 4) ->setSize(4, 4)
->setSubStyle($navigateUpQuad::SUBSTYLE_ToolUp) ->setSubStyle($navigateUpQuad::SUBSTYLE_ToolUp);
->setAction(self::ACTION_NAVIGATE_UP);
if (!$isInMapsFolder) {
$navigateRootQuad->setAction(self::ACTION_NAVIGATE_ROOT);
$navigateUpQuad->setAction(self::ACTION_NAVIGATE_UP);
}
$directoryLabel = new Label_Text(); $directoryLabel = new Label_Text();
$frame->add($directoryLabel); $frame->add($directoryLabel);