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

Apply fixes from StyleCI

Browse source
This commit is contained in:
Dane Everitt 2016-12-14 21:56:25 +00:00 • committed by StyleCI Bot
parent fc38b09e1f
commit efda0dd009
9 changed files with 98 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Controllers/Admin/ServiceController.php
View file

@ -28,7 +28,6 @@ use DB;
use Log;
use Alert;
use Storage;
use Validator;
use Pterodactyl\Models;
use Illuminate\Http\Request;
use Pterodactyl\Exceptions\DisplayException;
@ -292,12 +291,13 @@ class ServiceController extends Controller
public function getConfiguration(Request $request, $serviceId)
{
$service = Models\Service::findOrFail($serviceId);
return view('admin.services.config', [
'service' => $service,
'contents' => [
'json' => Storage::get('services/' . $service->file . '/main.json'),
'index' => Storage::get('services/' . $service->file . '/index.js')
]
'index' => Storage::get('services/' . $service->file . '/index.js'),
],
]);
}
@ -306,17 +306,19 @@ class ServiceController extends Controller
try {
$repo = new ServiceRepository\Service;
$repo->updateFile($serviceId, $request->except([
'_token'
'_token',
]));
return response('', 204);
} catch (DisplayException $ex) {
return response()->json([
'error' => $ex->getMessage()
'error' => $ex->getMessage(),
], 503);
} catch (\Exception $ex) {
Log::error($ex);
return response()->json([
'error' => 'An error occured while attempting to save the file.'
'error' => 'An error occured while attempting to save the file.',
], 503);
}
}