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

StyleCI cleanup

Browse source
This commit is contained in:
Dane Everitt 2017-03-12 16:34:43 -04:00
parent 37a723aa58
commit 1897741381
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
10 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Admin/OptionController.php
View file

@ -26,7 +26,6 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Storage;
use Javascript;
use Illuminate\Http\Request;
use Pterodactyl\Models\Service;
@ -67,7 +66,7 @@ class OptionController extends Controller
$option = $repo->create($request->intersect([
'service_id', 'name', 'description', 'tag',
'docker_image', 'startup', 'config_from', 'config_startup',
'config_logs', 'config_files', 'config_stop'
'config_logs', 'config_files', 'config_stop',
]));
Alert::success('Successfully created new service option.')->flash();
@ -195,7 +194,7 @@ class OptionController extends Controller
Alert::success("The service variable '{$variable->name}' has been updated.")->flash();
} else {
$repo->delete($variable);
Alert::success("That service variable has been deleted.")->flash();
Alert::success('That service variable has been deleted.')->flash();
}
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.variables', $option)->withErrors(json_decode($ex->getMessage()));

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

@ -149,16 +149,4 @@ class ServiceController extends Controller
return redirect()->route($redirectTo, $id);
}
/**
* Edits function file for a service.
*
* @param Request $request
* @param int $id
* @return \Illuminate\Response\RedirectResponse
*/
public function editFunctions(Request $request, $id)
{
}
}

2
app/Http/Controllers/Daemon/ServiceController.php
View file

@ -66,7 +66,7 @@ class ServiceController extends Controller
if ($file === 'index.js') {
return response($service->index_file)->header('Content-Type', 'text/plain');
} else if ($file === 'main.json') {
} elseif ($file === 'main.json') {
return response()->json($this->getConfiguration($service->id));
}