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

directory name changes + new functions

Browse Source
This commit is contained in:
kremsy 2017-05-15 19:30:22 +02:00
parent 32486eb468
commit 7ed2fe4d74
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Maps/DirectoryBrowser.php
View File

@ -112,7 +112,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$isInMapsFolder = ($mapsDir === $folderDir); $isInMapsFolder = ($mapsDir === $folderDir);
break; break;
case 'UserData': case 'UserData':
$dataDir = dirname($this->maniaControl->getServer()->getDirectory()->getGameDataFolder()); $dataDir = dirname($this->maniaControl->getServer()->getDirectory()->getUserDataFolder());
$folderDir = dirname($folderPath); $folderDir = dirname($folderPath);
if ($dataDir === $folderDir) { if ($dataDir === $folderDir) {
// Prevent navigation out of maps directory // Prevent navigation out of maps directory
@ -152,7 +152,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$directoryLabel = new Label_Text(); $directoryLabel = new Label_Text();
$frame->addChild($directoryLabel); $frame->addChild($directoryLabel);
$dataFolder = $this->maniaControl->getServer()->getDirectory()->getGameDataFolder(); $dataFolder = $this->maniaControl->getServer()->getDirectory()->getUserDataFolder();
$directoryText = substr($folderPath, strlen($dataFolder)); $directoryText = substr($folderPath, strlen($dataFolder));
$directoryLabel->setPosition($width * -0.41, $height * 0.45)->setSize($width * 0.85, 4)->setHorizontalAlign($directoryLabel::LEFT)->setText($directoryText)->setTextSize(2); $directoryLabel->setPosition($width * -0.41, $height * 0.45)->setSize($width * 0.85, 4)->setHorizontalAlign($directoryLabel::LEFT)->setText($directoryText)->setTextSize(2);

22
core/Server/Directory.php
View File

@ -78,7 +78,7 @@ class Directory implements CallbackListener, UsageInformationAble {
* @return string * @return string
*/ */
public function getLogsFolder() { public function getLogsFolder() {
return $this->getGameDataFolder() . '..' . DIRECTORY_SEPARATOR . 'Logs' . DIRECTORY_SEPARATOR; return $this->getUserDataFolder() . '..' . DIRECTORY_SEPARATOR . 'Logs' . DIRECTORY_SEPARATOR;
} }
/** /**
@ -87,9 +87,27 @@ class Directory implements CallbackListener, UsageInformationAble {
* @return string * @return string
*/ */
public function getGameDataFolder(){ public function getGameDataFolder(){
return $this->getUserDataFolder() . '..' . DIRECTORY_SEPARATOR . 'GameData' . DIRECTORY_SEPARATOR;
}
/**
* Retrieve the User Data Folder Path
*
* @return string
*/
public function getUserDataFolder() {
return $this->maniaControl->getClient()->gameDataDirectory(); return $this->maniaControl->getClient()->gameDataDirectory();
} }
/**
* Retrieve the Scripts Folder Path
*
* @return string
*/
public function getScriptsFolder(){
return $this->getGameDataFolder() . 'Scripts' . DIRECTORY_SEPARATOR;
}
/** /**
* @return bool * @return bool
*/ */
@ -103,6 +121,6 @@ class Directory implements CallbackListener, UsageInformationAble {
* @return string * @return string
*/ */
public function getCacheFolder() { public function getCacheFolder() {
return $this->getGameDataFolder() . '..' . DIRECTORY_SEPARATOR . 'CommonData' . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR; return $this->getUserDataFolder() . '..' . DIRECTORY_SEPARATOR . 'CommonData' . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
} }
} }

2
core/Server/Server.php
View File

@ -347,7 +347,7 @@ class Server implements CallbackListener, CommandListener, UsageInformationAble
* @return string * @return string
*/ */
public function getGhostReplay($login) { public function getGhostReplay($login) {
$dataDir = $this->getDirectory()->getGameDataFolder(); $dataDir = $this->getDirectory()->getUserDataFolder();
if (!$this->checkAccess($dataDir)) { if (!$this->checkAccess($dataDir)) {
return null; return null;
} }

2
plugins/MCTeam/Dedimania/DedimaniaPlugin.php
View File

@ -1115,7 +1115,7 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
// Set ghost replay // Set ghost replay
if ($record->rank <= 1) { if ($record->rank <= 1) {
$dataDirectory = $this->maniaControl->getServer()->getDirectory()->getGameDataFolder(); $dataDirectory = $this->maniaControl->getServer()->getDirectory()->getUserDataFolder();
if (!isset($this->dedimaniaData->directoryAccessChecked)) { if (!isset($this->dedimaniaData->directoryAccessChecked)) {
$access = $this->maniaControl->getServer()->checkAccess($dataDirectory); $access = $this->maniaControl->getServer()->checkAccess($dataDirectory);
if (!$access) { if (!$access) {