Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-10-27 04:12:28 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1146 from pterodactyl/feature/windows-pathinfo-support

Browse Source 
Add support for Windows, replace all backslashes with forwardslashes
This commit is contained in:
Dane Everitt 2018-05-20 16:24:58 -07:00 committed by GitHub
commit 002efddc96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Server/Files/FileActionsController.php
View File

@ -101,7 +101,7 @@ class FileActionsController extends Controller
{
$server = $request->attributes->get('server');
$dirname = pathinfo($file, PATHINFO_DIRNAME);
$dirname = str_replace('\\', '/', pathinfo($file, PATHINFO_DIRNAME));
try {
$content = $this->repository->setServer($server)->setToken($request->attributes->get('server_token'))->getContent($file);
} catch (RequestException $exception) {

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

@ -18,7 +18,7 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
*/
public function getFileStat(string $path): stdClass
{
$file = pathinfo($path);
$file = str_replace('\\', '/', pathinfo($path));
$file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/';
$response = $this->getHttpClient()->request('GET', sprintf(
@ -39,7 +39,7 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
*/
public function getContent(string $path): string
{
$file = pathinfo($path);
$file = str_replace('\\', '/', pathinfo($path));
$file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/';
$response = $this->getHttpClient()->request('GET', sprintf(
@ -61,7 +61,7 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
*/
public function putContent(string $path, string $content): ResponseInterface
{
$file = pathinfo($path);
$file = str_replace('\\', '/', pathinfo($path));
$file['dirname'] = in_array($file['dirname'], ['.', './', '/']) ? null : trim($file['dirname'], '/') . '/';
return $this->getHttpClient()->request('POST', 'server/file/save', [
@ -100,7 +100,7 @@ class FileRepository extends BaseRepository implements FileRepositoryInterface
array_push($files, [
'entry' => $value->name,
'directory' => trim($path, '/'),
'extension' => pathinfo($value->name, PATHINFO_EXTENSION),
'extension' => str_replace('\\', '/', pathinfo($value->name, PATHINFO_EXTENSION)),
'size' => human_readable($value->size),
'date' => strtotime($value->modified),
'mime' => $value->mime,