@@ -68,6 +68,7 @@ |
||
68 | 68 | * |
69 | 69 | * @param string $table |
70 | 70 | * @param string $field |
71 | + * @param string $attachedUuid |
|
71 | 72 | * @return string |
72 | 73 | */ |
73 | 74 | public function generateShort($table = 'servers', $field = 'uuidShort', $attachedUuid = null) |
@@ -62,7 +62,7 @@ |
||
62 | 62 | $sz = explode(',', 'B,KB,MB,GB'); |
63 | 63 | $factor = floor((strlen($bytes) - 1) / 3); |
64 | 64 | |
65 | - return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)).' '.$sz[$factor]; |
|
65 | + return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . ' ' . $sz[$factor]; |
|
66 | 66 | |
67 | 67 | } |
68 | 68 |
@@ -91,25 +91,25 @@ |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | if (is_null($this->option('dbhost'))) { |
94 | - $variables['DB_HOST'] = $this->anticipate('Database Host', [ 'localhost', '127.0.0.1', env('DB_HOST') ], env('DB_HOST')); |
|
94 | + $variables['DB_HOST'] = $this->anticipate('Database Host', ['localhost', '127.0.0.1', env('DB_HOST')], env('DB_HOST')); |
|
95 | 95 | } else { |
96 | 96 | $variables['DB_HOST'] = $this->option('dbhost'); |
97 | 97 | } |
98 | 98 | |
99 | 99 | if (is_null($this->option('dbport'))) { |
100 | - $variables['DB_PORT'] = $this->anticipate('Database Port', [ 3306, env('DB_PORT') ], env('DB_PORT')); |
|
100 | + $variables['DB_PORT'] = $this->anticipate('Database Port', [3306, env('DB_PORT')], env('DB_PORT')); |
|
101 | 101 | } else { |
102 | 102 | $variables['DB_PORT'] = $this->option('dbport'); |
103 | 103 | } |
104 | 104 | |
105 | 105 | if (is_null($this->option('dbname'))) { |
106 | - $variables['DB_DATABASE'] = $this->anticipate('Database Name', [ 'pterodactyl', 'homestead', ENV('DB_DATABASE') ], env('DB_DATABASE')); |
|
106 | + $variables['DB_DATABASE'] = $this->anticipate('Database Name', ['pterodactyl', 'homestead', ENV('DB_DATABASE')], env('DB_DATABASE')); |
|
107 | 107 | } else { |
108 | 108 | $variables['DB_DATABASE'] = $this->option('dbname'); |
109 | 109 | } |
110 | 110 | |
111 | 111 | if (is_null($this->option('dbuser'))) { |
112 | - $variables['DB_USERNAME'] = $this->anticipate('Database Username', [ ENV('DB_DATABASE') ], env('DB_USERNAME')); |
|
112 | + $variables['DB_USERNAME'] = $this->anticipate('Database Username', [ENV('DB_DATABASE')], env('DB_USERNAME')); |
|
113 | 113 | } else { |
114 | 114 | $variables['DB_USERNAME'] = $this->option('dbuser'); |
115 | 115 | } |
@@ -28,6 +28,6 @@ |
||
28 | 28 | */ |
29 | 29 | public function handle() |
30 | 30 | { |
31 | - $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL); |
|
31 | + $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL); |
|
32 | 32 | } |
33 | 33 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
66 | - if($this->auth->user()->root_admin !== 1) { |
|
66 | + if ($this->auth->user()->root_admin !== 1) { |
|
67 | 67 | return abort(403); |
68 | 68 | } |
69 | 69 |
@@ -49,7 +49,7 @@ |
||
49 | 49 | { |
50 | 50 | if (Session::has('applocale')) { |
51 | 51 | App::setLocale(Session::get('applocale')); |
52 | - } else if(Auth::check() && isset(Auth::user()->language)) { |
|
52 | + } else if (Auth::check() && isset(Auth::user()->language)) { |
|
53 | 53 | Session::set('applocale', Auth::user()->language); |
54 | 54 | App::setLocale(Auth::user()->language); |
55 | 55 | } else { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | ]); |
39 | 39 | |
40 | 40 | // Handle Index. Redirect /index to / |
41 | - $router->get('/index', function () { |
|
41 | + $router->get('/index', function() { |
|
42 | 42 | return redirect()->route('index'); |
43 | 43 | }); |
44 | 44 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | 'auth', |
57 | 57 | 'csrf' |
58 | 58 | ] |
59 | - ], function () use ($router) { |
|
59 | + ], function() use ($router) { |
|
60 | 60 | $router->get('/', [ |
61 | 61 | 'as' => 'account', |
62 | 62 | 'uses' => 'Base\AccountController@index' |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | 'auth', |
77 | 77 | 'csrf' |
78 | 78 | ] |
79 | - ], function () use ($router) { |
|
79 | + ], function() use ($router) { |
|
80 | 80 | $router->get('/', [ |
81 | 81 | 'as' => 'account.api', |
82 | 82 | 'uses' => 'Base\APIController@index' |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'auth', |
102 | 102 | 'csrf' |
103 | 103 | ] |
104 | - ], function () use ($router) { |
|
104 | + ], function() use ($router) { |
|
105 | 105 | $router->get('/', [ |
106 | 106 | 'as' => 'account.security', |
107 | 107 | 'uses' => 'Base\SecurityController@index' |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | 'admin', |
49 | 49 | 'csrf' |
50 | 50 | ] |
51 | - ], function () use ($router) { |
|
51 | + ], function() use ($router) { |
|
52 | 52 | $router->get('/', [ |
53 | 53 | 'as' => 'admin.settings', |
54 | 54 | 'uses' => 'Admin\BaseController@getSettings' |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | 'admin', |
66 | 66 | 'csrf' |
67 | 67 | ] |
68 | - ], function () use ($router) { |
|
68 | + ], function() use ($router) { |
|
69 | 69 | |
70 | 70 | // View All Accounts on System |
71 | 71 | $router->get('/', [ |
@@ -115,12 +115,12 @@ discard block |
||
115 | 115 | 'admin', |
116 | 116 | 'csrf' |
117 | 117 | ] |
118 | - ], function () use ($router) { |
|
118 | + ], function() use ($router) { |
|
119 | 119 | |
120 | 120 | // View All Servers |
121 | 121 | $router->get('/', [ |
122 | 122 | 'as' => 'admin.servers', |
123 | - 'uses' => 'Admin\ServersController@getIndex' ]); |
|
123 | + 'uses' => 'Admin\ServersController@getIndex']); |
|
124 | 124 | |
125 | 125 | // View Create Server Page |
126 | 126 | $router->get('/new', [ |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | 'admin', |
226 | 226 | 'csrf' |
227 | 227 | ] |
228 | - ], function () use ($router) { |
|
228 | + ], function() use ($router) { |
|
229 | 229 | |
230 | 230 | // View All Nodes |
231 | 231 | $router->get('/', [ |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | 'admin', |
298 | 298 | 'csrf' |
299 | 299 | ] |
300 | - ], function () use ($router) { |
|
300 | + ], function() use ($router) { |
|
301 | 301 | $router->get('/', [ |
302 | 302 | 'as' => 'admin.locations', |
303 | 303 | 'uses' => 'Admin\LocationsController@getIndex' |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | 'admin', |
322 | 322 | 'csrf' |
323 | 323 | ] |
324 | - ], function () use ($router) { |
|
324 | + ], function() use ($router) { |
|
325 | 325 | $router->get('/', [ |
326 | 326 | 'as' => 'admin.databases', |
327 | 327 | 'uses' => 'Admin\DatabaseController@getIndex' |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | 'admin', |
352 | 352 | 'csrf' |
353 | 353 | ] |
354 | - ], function () use ($router) { |
|
354 | + ], function() use ($router) { |
|
355 | 355 | $router->get('/', [ |
356 | 356 | 'as' => 'admin.services', |
357 | 357 | 'uses' => 'Admin\ServiceController@getIndex' |
@@ -29,7 +29,7 @@ |
||
29 | 29 | class RemoteRoutes { |
30 | 30 | |
31 | 31 | public function map(Router $router) { |
32 | - $router->group(['prefix' => 'remote'], function () use ($router) { |
|
32 | + $router->group(['prefix' => 'remote'], function() use ($router) { |
|
33 | 33 | // Handles Remote Download Authentication Requests |
34 | 34 | $router->post('download', [ |
35 | 35 | 'as' => 'remote.download', |