@@ -105,11 +105,11 @@ |
||
105 | 105 | */ |
106 | 106 | protected function registerModuleManifest(): void |
107 | 107 | { |
108 | - $this->singleton(PackageManifest::class, function (Application $app) { |
|
108 | + $this->singleton(PackageManifest::class, function(Application $app) { |
|
109 | 109 | return new PackageManifest(new Filesystem, $app->basePath()); |
110 | 110 | }); |
111 | 111 | |
112 | - $this->singleton(ModuleManifest::class, function (Application $app) { |
|
112 | + $this->singleton(ModuleManifest::class, function(Application $app) { |
|
113 | 113 | return new ModuleManifest( |
114 | 114 | new Filesystem, $app->basePath(), $app->bootstrapPath(Arcanesoft::ARCANESOFT_MODULES_CACHE) |
115 | 115 | ); |
@@ -288,7 +288,7 @@ |
||
288 | 288 | */ |
289 | 289 | protected function checkCanSeeChildren($administrator): bool |
290 | 290 | { |
291 | - return $this->children->filter(function (Item $child) use ($administrator) { |
|
291 | + return $this->children->filter(function(Item $child) use ($administrator) { |
|
292 | 292 | return $child->canSee($administrator); |
293 | 293 | })->isNotEmpty(); |
294 | 294 | } |
@@ -239,14 +239,15 @@ |
||
239 | 239 | */ |
240 | 240 | protected function parseUrl(array $attributes) : void |
241 | 241 | { |
242 | - if (isset($attributes['url'])) |
|
243 | - $this->setUrl($attributes['url']); |
|
244 | - elseif (isset($attributes['route'])) |
|
245 | - $this->route(...Arr::wrap($attributes['route'])); |
|
246 | - elseif (isset($attributes['action'])) |
|
247 | - $this->action(...Arr::wrap($attributes['action'])); |
|
248 | - else |
|
249 | - $this->setUrl('#'); |
|
242 | + if (isset($attributes['url'])) { |
|
243 | + $this->setUrl($attributes['url']); |
|
244 | + } elseif (isset($attributes['route'])) { |
|
245 | + $this->route(...Arr::wrap($attributes['route'])); |
|
246 | + } elseif (isset($attributes['action'])) { |
|
247 | + $this->action(...Arr::wrap($attributes['action'])); |
|
248 | + } else { |
|
249 | + $this->setUrl('#'); |
|
250 | + } |
|
250 | 251 | } |
251 | 252 | |
252 | 253 | /** |
@@ -74,8 +74,7 @@ |
||
74 | 74 | foreach ($items as $item) { |
75 | 75 | if (is_array($item)) { |
76 | 76 | $this->items->pushSidebarItem($item); |
77 | - } |
|
78 | - elseif (config()->has($item)) { |
|
77 | + } elseif (config()->has($item)) { |
|
79 | 78 | $this->loadFromConfig(config()->get($item)); |
80 | 79 | } |
81 | 80 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | |
46 | 46 | static::bindRouteClasses($routes); |
47 | 47 | |
48 | - $this->routes(function () use ($routes) { |
|
48 | + $this->routes(function() use ($routes) { |
|
49 | 49 | static::mapRouteClasses($routes); |
50 | 50 | }); |
51 | 51 | } |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | protected function adminGroup(Closure $callback): void |
69 | 69 | { |
70 | 70 | $this->prefix($this->getAdminPrefix()) |
71 | - ->middleware($this->getAdminMiddleware()) |
|
72 | - ->name($this->getAdminName()) |
|
73 | - ->group($this->prepareModuleCallback($callback)); |
|
71 | + ->middleware($this->getAdminMiddleware()) |
|
72 | + ->name($this->getAdminName()) |
|
73 | + ->group($this->prepareModuleCallback($callback)); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -82,9 +82,9 @@ discard block |
||
82 | 82 | { |
83 | 83 | $this->adminGroup(function () use ($callback) { |
84 | 84 | $this->prefix('api') |
85 | - ->name('api.') |
|
86 | - ->middleware(['ajax']) |
|
87 | - ->group($callback); |
|
85 | + ->name('api.') |
|
86 | + ->middleware(['ajax']) |
|
87 | + ->group($callback); |
|
88 | 88 | }); |
89 | 89 | } |
90 | 90 |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected function adminApiGroup(Closure $callback): void |
82 | 82 | { |
83 | - $this->adminGroup(function () use ($callback) { |
|
83 | + $this->adminGroup(function() use ($callback) { |
|
84 | 84 | $this->prefix('api') |
85 | 85 | ->name('api.') |
86 | 86 | ->middleware(['ajax']) |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | private function prepareModuleCallback(Closure $callback): Closure |
99 | 99 | { |
100 | 100 | return method_exists($this, 'moduleGroup') |
101 | - ? function () use ($callback) { $this->moduleGroup($callback); } |
|
101 | + ? function() use ($callback) { $this->moduleGroup($callback); } |
|
102 | 102 | : $callback; |
103 | 103 | } |
104 | 104 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | */ |
25 | 25 | public function map(): void |
26 | 26 | { |
27 | - $this->prefix('routes-viewer')->name('routes-viewer.')->group(function () { |
|
27 | + $this->prefix('routes-viewer')->name('routes-viewer.')->group(function() { |
|
28 | 28 | // admin::system.routes-viewer.index |
29 | 29 | $this->get('/', [RoutesViewerController::class, 'index']) |
30 | 30 | ->name('index'); |
@@ -26,12 +26,12 @@ |
||
26 | 26 | $this->prefix('routes-viewer')->name('routes-viewer.')->group(function () { |
27 | 27 | // admin::system.routes-viewer.index |
28 | 28 | $this->get('/', [RoutesViewerController::class, 'index']) |
29 | - ->name('index'); |
|
29 | + ->name('index'); |
|
30 | 30 | |
31 | 31 | // admin::system.routes-viewer.index |
32 | 32 | $this->post('datatable', [RoutesViewerController::class, 'datatable']) |
33 | - ->middleware(['ajax']) |
|
34 | - ->name('datatable'); |
|
33 | + ->middleware(['ajax']) |
|
34 | + ->name('datatable'); |
|
35 | 35 | }); |
36 | 36 | } |
37 | 37 | } |
@@ -27,15 +27,15 @@ |
||
27 | 27 | $this->prefix('maintenance')->name('maintenance.')->group(function () { |
28 | 28 | // admin::system.maintenance.index |
29 | 29 | $this->get('/', [MaintenanceController::class, 'index']) |
30 | - ->name('index'); |
|
30 | + ->name('index'); |
|
31 | 31 | |
32 | 32 | // admin::system.maintenance.start |
33 | 33 | $this->post('start', [MaintenanceController::class, 'start']) |
34 | - ->name('start'); |
|
34 | + ->name('start'); |
|
35 | 35 | |
36 | 36 | // admin::system.maintenance.stop |
37 | 37 | $this->post('stop', [MaintenanceController::class, 'stop']) |
38 | - ->name('stop'); |
|
38 | + ->name('stop'); |
|
39 | 39 | }); |
40 | 40 | } |
41 | 41 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | */ |
25 | 25 | public function map(): void |
26 | 26 | { |
27 | - $this->prefix('maintenance')->name('maintenance.')->group(function () { |
|
27 | + $this->prefix('maintenance')->name('maintenance.')->group(function() { |
|
28 | 28 | // admin::system.maintenance.index |
29 | 29 | $this->get('/', [MaintenanceController::class, 'index']) |
30 | 30 | ->name('index'); |
@@ -27,31 +27,31 @@ |
||
27 | 27 | $this->prefix('log-viewer')->name('log-viewer.')->group(function () { |
28 | 28 | // admin::system.log-viewer.index |
29 | 29 | $this->get('/', [LogViewerController::class, 'index']) |
30 | - ->name('index'); |
|
30 | + ->name('index'); |
|
31 | 31 | |
32 | 32 | $this->prefix('logs')->name('logs.')->group(function () { |
33 | 33 | $this->prefix('{admin_log_file_date}')->group(function () { |
34 | 34 | // admin::system.log-viewer.logs.show |
35 | 35 | $this->get('/', [LogViewerController::class, 'showLog']) |
36 | - ->name('show'); |
|
36 | + ->name('show'); |
|
37 | 37 | |
38 | 38 | // admin::system.log-viewer.logs.download |
39 | 39 | $this->get('download', [LogViewerController::class, 'download']) |
40 | - ->name('download'); |
|
40 | + ->name('download'); |
|
41 | 41 | |
42 | 42 | // admin::system.log-viewer.logs.delete |
43 | 43 | $this->delete('delete', [LogViewerController::class, 'delete']) |
44 | - ->middleware(['ajax']) |
|
45 | - ->name('delete'); |
|
44 | + ->middleware(['ajax']) |
|
45 | + ->name('delete'); |
|
46 | 46 | |
47 | 47 | $this->prefix('{admin_log_level}')->group(function () { |
48 | 48 | // admin::system.log-viewer.logs.filter |
49 | 49 | $this->get('/', [LogViewerController::class, 'filter']) |
50 | - ->name('filter'); |
|
50 | + ->name('filter'); |
|
51 | 51 | |
52 | 52 | // admin::system.log-viewer.logs.search |
53 | 53 | $this->get('search', [LogViewerController::class, 'search']) |
54 | - ->name('search'); |
|
54 | + ->name('search'); |
|
55 | 55 | }); |
56 | 56 | }); |
57 | 57 | }); |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | */ |
25 | 25 | public function map(): void |
26 | 26 | { |
27 | - $this->prefix('log-viewer')->name('log-viewer.')->group(function () { |
|
27 | + $this->prefix('log-viewer')->name('log-viewer.')->group(function() { |
|
28 | 28 | // admin::system.log-viewer.index |
29 | 29 | $this->get('/', [LogViewerController::class, 'index']) |
30 | 30 | ->name('index'); |
31 | 31 | |
32 | - $this->prefix('logs')->name('logs.')->group(function () { |
|
33 | - $this->prefix('{admin_log_file_date}')->group(function () { |
|
32 | + $this->prefix('logs')->name('logs.')->group(function() { |
|
33 | + $this->prefix('{admin_log_file_date}')->group(function() { |
|
34 | 34 | // admin::system.log-viewer.logs.show |
35 | 35 | $this->get('/', [LogViewerController::class, 'showLog']) |
36 | 36 | ->name('show'); |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | ->middleware(['ajax']) |
45 | 45 | ->name('delete'); |
46 | 46 | |
47 | - $this->prefix('{admin_log_level}')->group(function () { |
|
47 | + $this->prefix('{admin_log_level}')->group(function() { |
|
48 | 48 | // admin::system.log-viewer.logs.filter |
49 | 49 | $this->get('/', [LogViewerController::class, 'filter']) |
50 | 50 | ->name('filter'); |
@@ -74,8 +74,9 @@ |
||
74 | 74 | { |
75 | 75 | $ips = explode(PHP_EOL, (string) $this->input('allowed')); |
76 | 76 | |
77 | - if ((bool) $this->input('allow_current_ip')) |
|
78 | - $ips[] = $this->ip(); |
|
77 | + if ((bool) $this->input('allow_current_ip')) { |
|
78 | + $ips[] = $this->ip(); |
|
79 | + } |
|
79 | 80 | |
80 | 81 | return array_unique(array_filter($ips)); |
81 | 82 | } |