Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply fixes from StyleCI (#260)

Browse source
This commit is contained in:
Dane Everitt 2017-01-21 15:56:32 -05:00 committed by GitHub
parent 19da4eda04
commit 355697dbb5
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Server/TaskController.php
View file

@ -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();

1
app/Http/Middleware/AdminAuthenticate.php
View file

@ -71,6 +71,7 @@ class AdminAuthenticate
// @TODO: eventually update admin themes
Theme::set('default');
return $next($request);
}
}

5
app/Models/User.php
View file

@ -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;
}
}

4
resources/lang/en/base.php
View file

@ -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',

4
resources/lang/en/server.php
View file

@ -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.',
],
],
];