dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Fix filemanager file edit bug, closes #867

Browse Source
This commit is contained in:
Dane Everitt 2018-01-21 12:31:41 -06:00
parent 2212f28351
commit c69f48ad83
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
### Fixed ### Fixed
* `[beta.4]` — Fixes some bad search and replace action that happened previously and was throwing errors when validating user permissions. * `[beta.4]` — Fixes some bad search and replace action that happened previously and was throwing errors when validating user permissions.
* `[beta.4]` — Fixes behavior of variable validation to not break the page when no rules are provided. * `[beta.4]` — Fixes behavior of variable validation to not break the page when no rules are provided.
* `[beta.4]` — Fix bug preventing the editing of files in the file manager.
## v0.7.0-beta.4 (Derelict Dermodactylus) ## v0.7.0-beta.4 (Derelict Dermodactylus)
### Fixed ### Fixed

4
app/Contracts/Repository/Daemon/FileRepositoryInterface.php
View File

@ -21,11 +21,11 @@ interface FileRepositoryInterface extends BaseRepositoryInterface
* Return the contents of a given file if it can be edited in the Panel. * Return the contents of a given file if it can be edited in the Panel.
* *
* @param string $path * @param string $path
* @return \stdClass * @return string
* *
* @throws \GuzzleHttp\Exception\RequestException * @throws \GuzzleHttp\Exception\RequestException
*/ */
public function getContent(string $path): stdClass; public function getContent(string $path): string;
/** /**
* Save new contents to a given file. * Save new contents to a given file.

4
app/Repositories/Daemon/FileRepository.php
View File

@ -33,11 +33,11 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
* Return the contents of a given file if it can be edited in the Panel. * Return the contents of a given file if it can be edited in the Panel.
* *
* @param string $path * @param string $path
* @return \stdClass * @return string
* *
* @throws \GuzzleHttp\Exception\RequestException * @throws \GuzzleHttp\Exception\RequestException
*/ */
public function getContent(string $path): stdClass public function getContent(string $path): string
{ {
$file = pathinfo($path); $file = pathinfo($path);
$file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/'; $file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/';