From 355697dbb5db990b984bcddb0f97fea9d21db812 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 21 Jan 2017 15:56:32 -0500 Subject: [PATCH] Apply fixes from StyleCI (#260) --- app/Http/Controllers/Server/TaskController.php | 2 ++ app/Http/Middleware/AdminAuthenticate.php | 1 + app/Models/User.php | 5 +++-- resources/lang/en/base.php | 4 ++-- resources/lang/en/server.php | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Server/TaskController.php b/app/Http/Controllers/Server/TaskController.php index a5cd01512..fc81a95f0 100644 --- a/app/Http/Controllers/Server/TaskController.php +++ b/app/Http/Controllers/Server/TaskController.php @@ -73,6 +73,7 @@ class TaskController extends Controller 'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']), 'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'), ]); + return view('server.tasks.new', [ 'server' => $server, 'node' => $node, @@ -89,6 +90,7 @@ class TaskController extends Controller $repo->create($server->id, $request->except([ '_token', ])); + return redirect()->route('server.tasks', $uuid); } catch (DisplayValidationException $ex) { return redirect()->route('server.tasks.new', $uuid)->withErrors(json_decode($ex->getMessage()))->withInput(); diff --git a/app/Http/Middleware/AdminAuthenticate.php b/app/Http/Middleware/AdminAuthenticate.php index 505d7c08c..56125b32a 100644 --- a/app/Http/Middleware/AdminAuthenticate.php +++ b/app/Http/Middleware/AdminAuthenticate.php @@ -71,6 +71,7 @@ class AdminAuthenticate // @TODO: eventually update admin themes Theme::set('default'); + return $next($request); } } diff --git a/app/Models/User.php b/app/Models/User.php index 384e06059..3d0998b35 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -150,9 +150,10 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac /** * Return true or false depending on wether the user is root admin or not. * - * @return boolean the user is root admin + * @return bool the user is root admin */ - public function isRootAdmin() { + public function isRootAdmin() + { return $this->root_admin === 1; } } diff --git a/resources/lang/en/base.php b/resources/lang/en/base.php index 392a23d1d..4891ff61b 100644 --- a/resources/lang/en/base.php +++ b/resources/lang/en/base.php @@ -32,11 +32,11 @@ return [ 'form_title' => 'Details', 'descriptive_memo' => [ 'title' => 'Descriptive Memo', - 'description' => 'Enter a brief description of what this API key will be used for.' + 'description' => 'Enter a brief description of what this API key will be used for.', ], 'allowed_ips' => [ 'title' => 'Allowed IPs', - 'description' => 'Enter a line delimitated list of IPs that are allowed to access the API using this key. CIDR notation is allowed. Leave blank to allow any IP.' + 'description' => 'Enter a line delimitated list of IPs that are allowed to access the API using this key. CIDR notation is allowed. Leave blank to allow any IP.', ], 'base' => [ 'title' => 'Base Information', diff --git a/resources/lang/en/server.php b/resources/lang/en/server.php index f629c52d3..05d42a71f 100644 --- a/resources/lang/en/server.php +++ b/resources/lang/en/server.php @@ -46,7 +46,7 @@ return [ 'update' => 'Update Subuser', 'edit' => [ 'header' => 'Edit Subuser', - 'header_sub' => 'Modify user\'s access to server.' + 'header_sub' => 'Modify user\'s access to server.', ], 'new' => [ 'header' => 'Add New User', @@ -255,7 +255,7 @@ return [ 'header_sub' => 'Control the IPs and ports available on this server.', 'available' => 'Available Allocations', 'help' => 'Allocation Help', - 'help_text' => 'The list to the left includes all available IPs and ports that are open for your server to use for incoming connections.' + 'help_text' => 'The list to the left includes all available IPs and ports that are open for your server to use for incoming connections.', ], ], ];