StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code cleanup and fixes filemanager

Browse source
This commit is contained in:
Dane Everitt 2016-01-01 18:08:15 -05:00
parent a391a2d854
commit 46117afc77
9 changed files with 246 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Server/AjaxController.php
View file

@ -6,10 +6,9 @@ use Log;
use Debugbar;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\Node;
use Pterodactyl\Http\Helpers;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Scales\FileController;
use Pterodactyl\Repositories;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Http\Request;
@ -119,7 +118,7 @@ class AjaxController extends Controller
$prevDir['link_show'] = trim($prevDir['link'], '/');
}
$controller = new FileController($uuid);
$controller = new Repositories\Daemon\FileRepository($uuid);
try {
$directoryContents = $controller->returnDirectoryListing($this->directory);
@ -140,7 +139,7 @@ class AjaxController extends Controller
'server' => $server,
'files' => $directoryContents->files,
'folders' => $directoryContents->folders,
'extensions' => Helpers::editableFiles(),
'extensions' => Repositories\HelperRepository::editableFiles(),
'directory' => $prevDir
]);
@ -159,7 +158,7 @@ class AjaxController extends Controller
$server = Server::getByUUID($uuid);
$this->authorize('save-files', $server);
$controller = new FileController($uuid);
$controller = new Repositories\Daemon\FileRepository($uuid);
try {
$controller->saveFileContents($request->input('file'), $request->input('contents'));

8
app/Http/Controllers/Server/ServerController.php
View file

@ -11,7 +11,7 @@ use Uuid;
use Alert;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Scales\FileController;
use Pterodactyl\Repositories;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Http\Request;
@ -102,7 +102,7 @@ class ServerController extends Controller
$this->authorize('edit-files', $server);
$fileInfo = (object) pathinfo($file);
$controller = new FileController($uuid);
$controller = new Repositories\Daemon\FileRepository($uuid);
try {
$fileContent = $controller->returnFileContents($file);
@ -124,7 +124,7 @@ class ServerController extends Controller
'server' => $server,
'node' => Node::find($server->node),
'file' => $file,
'contents' => $fileContent->contents,
'contents' => $fileContent->content,
'directory' => (in_array($fileInfo->dirname, ['.', './', '/'])) ? '/' : trim($fileInfo->dirname, '/') . '/',
'extension' => $fileInfo->extension
]);
@ -155,7 +155,7 @@ class ServerController extends Controller
$download->save();
return redirect('https://' . $node->fqdn . ':' . $node->daemonListen . '/server/download/' . $download->token);
return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/download/' . $download->token);
}