@@ -10,60 +10,60 @@ |
||
10 | 10 | |
11 | 11 | class EpesiServiceProvider extends ServiceProvider |
12 | 12 | { |
13 | - /** |
|
14 | - * Booting the package. |
|
15 | - */ |
|
16 | - public function boot() |
|
17 | - { |
|
18 | - $this->ensureHttps(); |
|
13 | + /** |
|
14 | + * Booting the package. |
|
15 | + */ |
|
16 | + public function boot() |
|
17 | + { |
|
18 | + $this->ensureHttps(); |
|
19 | 19 | |
20 | - if (env('APP_DEBUG', false)) ModuleManager::clearCache(); |
|
20 | + if (env('APP_DEBUG', false)) ModuleManager::clearCache(); |
|
21 | 21 | |
22 | - Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() { |
|
23 | - Route::any('/', 'SystemController@index'); |
|
24 | - Route::get('logo', 'SystemController@logo'); |
|
25 | - Route::any('install', 'SystemController@install'); |
|
22 | + Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() { |
|
23 | + Route::any('/', 'SystemController@index'); |
|
24 | + Route::get('logo', 'SystemController@logo'); |
|
25 | + Route::any('install', 'SystemController@install'); |
|
26 | 26 | |
27 | - Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() { |
|
28 | - Route::any('home', 'SystemController@home')->name('home'); |
|
27 | + Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() { |
|
28 | + Route::any('home', 'SystemController@home')->name('home'); |
|
29 | 29 | |
30 | - Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view'); |
|
31 | - }); |
|
32 | - }); |
|
30 | + Route::any('view/{alias}/{method?}/{args?}', 'SystemController@view'); |
|
31 | + }); |
|
32 | + }); |
|
33 | 33 | |
34 | - // call boot methods on all modules |
|
35 | - ModuleManager::call('boot'); |
|
34 | + // call boot methods on all modules |
|
35 | + ModuleManager::call('boot'); |
|
36 | 36 | |
37 | 37 | foreach (ModuleManager::collect('translations') as $path) { |
38 | 38 | $this->loadJsonTranslationsFrom($path); |
39 | 39 | } |
40 | 40 | |
41 | - // Register admin service provider if in admin mode or in console |
|
42 | - // TODO: apply access restriction to admin mode |
|
41 | + // Register admin service provider if in admin mode or in console |
|
42 | + // TODO: apply access restriction to admin mode |
|
43 | 43 | // if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) { |
44 | - if ($this->app->runningInConsole() || request('admin', false)) { |
|
45 | - $this->app->register(AdminServiceProvider::class); |
|
46 | - } |
|
47 | - } |
|
44 | + if ($this->app->runningInConsole() || request('admin', false)) { |
|
45 | + $this->app->register(AdminServiceProvider::class); |
|
46 | + } |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Register the provider. |
|
51 | - */ |
|
52 | - public function register() |
|
53 | - { |
|
54 | - $this->app->singleton(App::class); |
|
55 | - } |
|
49 | + /** |
|
50 | + * Register the provider. |
|
51 | + */ |
|
52 | + public function register() |
|
53 | + { |
|
54 | + $this->app->singleton(App::class); |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * Force to set https scheme if https enabled. |
|
59 | - * |
|
60 | - * @return void |
|
61 | - */ |
|
62 | - protected function ensureHttps() |
|
63 | - { |
|
64 | - if (config('epesi.https') || config('epesi.secure')) { |
|
65 | - url()->forceScheme('https'); |
|
66 | - $this->app['request']->server->set('HTTPS', true); |
|
67 | - } |
|
68 | - } |
|
57 | + /** |
|
58 | + * Force to set https scheme if https enabled. |
|
59 | + * |
|
60 | + * @return void |
|
61 | + */ |
|
62 | + protected function ensureHttps() |
|
63 | + { |
|
64 | + if (config('epesi.https') || config('epesi.secure')) { |
|
65 | + url()->forceScheme('https'); |
|
66 | + $this->app['request']->server->set('HTTPS', true); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | } |
@@ -17,7 +17,9 @@ |
||
17 | 17 | { |
18 | 18 | $this->ensureHttps(); |
19 | 19 | |
20 | - if (env('APP_DEBUG', false)) ModuleManager::clearCache(); |
|
20 | + if (env('APP_DEBUG', false)) { |
|
21 | + ModuleManager::clearCache(); |
|
22 | + } |
|
21 | 23 | |
22 | 24 | Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() { |
23 | 25 | Route::any('/', 'SystemController@index'); |
@@ -42,7 +42,9 @@ |
||
42 | 42 | }); |
43 | 43 | |
44 | 44 | $logo->onUpload(function ($files) use ($form, $logo) { |
45 | - if ($files === 'error') return $form->error('logo', __('Error uploading image')); |
|
45 | + if ($files === 'error') { |
|
46 | + return $form->error('logo', __('Error uploading image')); |
|
47 | + } |
|
46 | 48 | |
47 | 49 | $tmpPath = self::alias() . '/tmp/' . $files['name']; |
48 | 50 |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo)); |
49 | 49 | }); |
50 | 50 | |
51 | - $logo->onUpload(function ($files) use ($form, $logo) { |
|
51 | + $logo->onUpload(function($files) use ($form, $logo) { |
|
52 | 52 | if ($files === 'error') return $form->error('logo', __('Error uploading image')); |
53 | 53 | |
54 | 54 | $tmpPath = self::alias() . '/tmp/' . $files['name']; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | }); |
60 | 60 | |
61 | 61 | $form->onSubmit(function($form) { |
62 | - if ($name = $form->model['custom_logo']? $form->model['logo']: null) { |
|
62 | + if ($name = $form->model['custom_logo'] ? $form->model['logo'] : null) { |
|
63 | 63 | $storage = $this->storage(); |
64 | 64 | $from = self::alias() . '/tmp/' . $name; |
65 | 65 | $to = self::alias() . '/' . $name; |
@@ -8,79 +8,79 @@ |
||
8 | 8 | |
9 | 9 | class ActionButton extends View |
10 | 10 | { |
11 | - public $defaultTemplate = 'action_button.html'; |
|
11 | + public $defaultTemplate = 'action_button.html'; |
|
12 | 12 | |
13 | - public $ui = 'basic inverted action button'; |
|
13 | + public $ui = 'basic inverted action button'; |
|
14 | 14 | |
15 | - /** |
|
16 | - * Icon that will appear on the button (top). |
|
17 | - * |
|
18 | - * @var string|array|Icon |
|
19 | - */ |
|
20 | - public $icon; |
|
15 | + /** |
|
16 | + * Icon that will appear on the button (top). |
|
17 | + * |
|
18 | + * @var string|array|Icon |
|
19 | + */ |
|
20 | + public $icon; |
|
21 | 21 | |
22 | - public $label; |
|
22 | + public $label; |
|
23 | 23 | |
24 | - public $element = 'a'; |
|
24 | + public $element = 'a'; |
|
25 | 25 | |
26 | - public $weight = 10; |
|
26 | + public $weight = 10; |
|
27 | 27 | |
28 | - public $callback; |
|
28 | + public $callback; |
|
29 | 29 | |
30 | - public function renderView() |
|
31 | - { |
|
32 | - $this->addIcon(); |
|
30 | + public function renderView() |
|
31 | + { |
|
32 | + $this->addIcon(); |
|
33 | 33 | |
34 | - $this->addLabel(); |
|
34 | + $this->addLabel(); |
|
35 | 35 | |
36 | - $this->addCallback(); |
|
36 | + $this->addCallback(); |
|
37 | 37 | |
38 | - parent::renderView(); |
|
39 | - } |
|
38 | + parent::renderView(); |
|
39 | + } |
|
40 | 40 | |
41 | - protected function addIcon() |
|
42 | - { |
|
43 | - if (! $icon = $this->getIcon()) return; |
|
41 | + protected function addIcon() |
|
42 | + { |
|
43 | + if (! $icon = $this->getIcon()) return; |
|
44 | 44 | |
45 | - $this->add($icon, 'Icon')->id = null; |
|
45 | + $this->add($icon, 'Icon')->id = null; |
|
46 | 46 | |
47 | - $this->addClass('icon'); |
|
47 | + $this->addClass('icon'); |
|
48 | 48 | |
49 | - return $this; |
|
50 | - } |
|
49 | + return $this; |
|
50 | + } |
|
51 | 51 | |
52 | - protected function addLabel() |
|
53 | - { |
|
54 | - $this->content = $this->label?: $this->content; |
|
52 | + protected function addLabel() |
|
53 | + { |
|
54 | + $this->content = $this->label?: $this->content; |
|
55 | 55 | |
56 | - return $this; |
|
57 | - } |
|
56 | + return $this; |
|
57 | + } |
|
58 | 58 | |
59 | - public function getIcon() |
|
60 | - { |
|
61 | - return is_object($this->icon)? $this->icon: new Icon($this->icon); |
|
62 | - } |
|
59 | + public function getIcon() |
|
60 | + { |
|
61 | + return is_object($this->icon)? $this->icon: new Icon($this->icon); |
|
62 | + } |
|
63 | 63 | |
64 | - public function callback($callable) |
|
65 | - { |
|
66 | - $this->callback = $callable; |
|
64 | + public function callback($callable) |
|
65 | + { |
|
66 | + $this->callback = $callable; |
|
67 | 67 | |
68 | - return $this; |
|
69 | - } |
|
68 | + return $this; |
|
69 | + } |
|
70 | 70 | |
71 | - public function addCallback() |
|
72 | - { |
|
73 | - if (!$callable = $this->callback) return; |
|
71 | + public function addCallback() |
|
72 | + { |
|
73 | + if (!$callable = $this->callback) return; |
|
74 | 74 | |
75 | - if (is_callable($callable)) { |
|
76 | - $callable = $this->add('jsCallback')->set($callable); |
|
77 | - } |
|
75 | + if (is_callable($callable)) { |
|
76 | + $callable = $this->add('jsCallback')->set($callable); |
|
77 | + } |
|
78 | 78 | |
79 | - if ($callable instanceof jsCallback) { |
|
80 | - $this->on('click', $callable); |
|
81 | - } |
|
79 | + if ($callable instanceof jsCallback) { |
|
80 | + $this->on('click', $callable); |
|
81 | + } |
|
82 | 82 | |
83 | - return $this; |
|
84 | - } |
|
83 | + return $this; |
|
84 | + } |
|
85 | 85 | |
86 | 86 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | protected function addIcon() |
42 | 42 | { |
43 | - if (! $icon = $this->getIcon()) return; |
|
43 | + if (!$icon = $this->getIcon()) return; |
|
44 | 44 | |
45 | 45 | $this->add($icon, 'Icon')->id = null; |
46 | 46 | |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | |
52 | 52 | protected function addLabel() |
53 | 53 | { |
54 | - $this->content = $this->label?: $this->content; |
|
54 | + $this->content = $this->label ?: $this->content; |
|
55 | 55 | |
56 | 56 | return $this; |
57 | 57 | } |
58 | 58 | |
59 | 59 | public function getIcon() |
60 | 60 | { |
61 | - return is_object($this->icon)? $this->icon: new Icon($this->icon); |
|
61 | + return is_object($this->icon) ? $this->icon : new Icon($this->icon); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function callback($callable) |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | protected function addIcon() |
42 | 42 | { |
43 | - if (! $icon = $this->getIcon()) return; |
|
43 | + if (! $icon = $this->getIcon()) { |
|
44 | + return; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | $this->add($icon, 'Icon')->id = null; |
46 | 48 | |
@@ -70,7 +72,9 @@ discard block |
||
70 | 72 | |
71 | 73 | public function addCallback() |
72 | 74 | { |
73 | - if (!$callable = $this->callback) return; |
|
75 | + if (!$callable = $this->callback) { |
|
76 | + return; |
|
77 | + } |
|
74 | 78 | |
75 | 79 | if (is_callable($callable)) { |
76 | 80 | $callable = $this->add('jsCallback')->set($callable); |
@@ -14,11 +14,11 @@ discard block |
||
14 | 14 | */ |
15 | 15 | final public static function view($alias = null) |
16 | 16 | { |
17 | - $class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View')); |
|
17 | + $class = self::namespace() . '\\' . ($alias ? Str::studly($alias) : (static::name() . 'View')); |
|
18 | 18 | |
19 | 19 | if ($alias) return $class; |
20 | 20 | |
21 | - return static::$view?: $class; |
|
21 | + return static::$view ?: $class; |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | { |
66 | 66 | $names = array_slice(explode('\\', static::class), -2, -1); |
67 | 67 | |
68 | - return $names? reset($names): ''; |
|
68 | + return $names ? reset($names) : ''; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -16,7 +16,9 @@ |
||
16 | 16 | { |
17 | 17 | $class = self::namespace() . '\\' . ($alias? Str::studly($alias): (static::name() . 'View')); |
18 | 18 | |
19 | - if ($alias) return $class; |
|
19 | + if ($alias) { |
|
20 | + return $class; |
|
21 | + } |
|
20 | 22 | |
21 | 23 | return static::$view?: $class; |
22 | 24 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | public function index() |
14 | 14 | { |
15 | - return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
15 | + return SystemCore::isInstalled() ? redirect('home') : redirect('install'); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function install(Epesi $epesi) |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | public function home() |
38 | 38 | { |
39 | - return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath(): 'install'); |
|
39 | + return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath() : 'install'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function logo() |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | - if (! $view) abort(404); |
|
67 | + if (!$view) abort(404); |
|
68 | 68 | |
69 | 69 | $epesi->add($view)->displayModuleContent($method, $args); |
70 | 70 |
@@ -20,7 +20,9 @@ discard block |
||
20 | 20 | // make sure the installation information is fresh |
21 | 21 | ModuleManager::clearCache(); |
22 | 22 | |
23 | - if (SystemCore::isInstalled()) return redirect('home'); |
|
23 | + if (SystemCore::isInstalled()) { |
|
24 | + return redirect('home'); |
|
25 | + } |
|
24 | 26 | |
25 | 27 | $epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
26 | 28 | |
@@ -64,7 +66,9 @@ discard block |
||
64 | 66 | } |
65 | 67 | } |
66 | 68 | |
67 | - if (! $view) abort(404); |
|
69 | + if (! $view) { |
|
70 | + abort(404); |
|
71 | + } |
|
68 | 72 | |
69 | 73 | $epesi->add($view)->displayModuleContent($method, $args); |
70 | 74 |
@@ -11,66 +11,66 @@ |
||
11 | 11 | |
12 | 12 | class SystemController extends Controller |
13 | 13 | { |
14 | - public function index() |
|
15 | - { |
|
16 | - return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
17 | - } |
|
14 | + public function index() |
|
15 | + { |
|
16 | + return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
17 | + } |
|
18 | 18 | |
19 | - public function install(Epesi $epesi) |
|
20 | - { |
|
21 | - // make sure the installation information is fresh |
|
22 | - ModuleManager::clearCache(); |
|
19 | + public function install(Epesi $epesi) |
|
20 | + { |
|
21 | + // make sure the installation information is fresh |
|
22 | + ModuleManager::clearCache(); |
|
23 | 23 | |
24 | - if (SystemCore::isInstalled()) return redirect('home'); |
|
24 | + if (SystemCore::isInstalled()) return redirect('home'); |
|
25 | 25 | |
26 | - $epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
|
26 | + $epesi->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
|
27 | 27 | |
28 | - $epesi->initLayout('Centered'); |
|
28 | + $epesi->initLayout('Centered'); |
|
29 | 29 | |
30 | - $epesi->layout->set('logo', url('logo')); |
|
31 | - $epesi->layout->template->setHTML('copyright', config('epesi.app.copyright')); |
|
30 | + $epesi->layout->set('logo', url('logo')); |
|
31 | + $epesi->layout->template->setHTML('copyright', config('epesi.app.copyright')); |
|
32 | 32 | |
33 | - $epesi->add(new \Epesi\Core\System\SystemInstallWizard()); |
|
33 | + $epesi->add(new \Epesi\Core\System\SystemInstallWizard()); |
|
34 | 34 | |
35 | - return $epesi->response(); |
|
36 | - } |
|
35 | + return $epesi->response(); |
|
36 | + } |
|
37 | 37 | |
38 | - public function home() |
|
39 | - { |
|
40 | - return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath(): 'install'); |
|
41 | - } |
|
38 | + public function home() |
|
39 | + { |
|
40 | + return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\HomePageSettings::getUserHomePagePath(): 'install'); |
|
41 | + } |
|
42 | 42 | |
43 | - public function logo() |
|
44 | - { |
|
45 | - $logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile(); |
|
43 | + public function logo() |
|
44 | + { |
|
45 | + $logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile(); |
|
46 | 46 | |
47 | - return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic(); |
|
48 | - } |
|
47 | + return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic(); |
|
48 | + } |
|
49 | 49 | |
50 | - public function view(Epesi $epesi, $module, $method = 'body', $args = []) |
|
51 | - { |
|
52 | - $epesi->initLayout(new LayoutView()); |
|
50 | + public function view(Epesi $epesi, $module, $method = 'body', $args = []) |
|
51 | + { |
|
52 | + $epesi->initLayout(new LayoutView()); |
|
53 | 53 | |
54 | - $alias = explode(':', $module); |
|
54 | + $alias = explode(':', $module); |
|
55 | 55 | |
56 | - $moduleAlias = $alias[0]; |
|
57 | - $viewAlias = $alias[1]?? null; |
|
56 | + $moduleAlias = $alias[0]; |
|
57 | + $viewAlias = $alias[1]?? null; |
|
58 | 58 | |
59 | - $view = null; |
|
60 | - if ($module = ModuleManager::getClass($moduleAlias, true)) { |
|
61 | - $viewClass = $module::view($viewAlias); |
|
59 | + $view = null; |
|
60 | + if ($module = ModuleManager::getClass($moduleAlias, true)) { |
|
61 | + $viewClass = $module::view($viewAlias); |
|
62 | 62 | |
63 | - if (class_exists($viewClass)) { |
|
64 | - $view = new $viewClass(); |
|
65 | - } |
|
66 | - } |
|
63 | + if (class_exists($viewClass)) { |
|
64 | + $view = new $viewClass(); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | |
68 | - if (! $view) abort(404); |
|
68 | + if (! $view) abort(404); |
|
69 | 69 | |
70 | - $epesi->add($view)->displayModuleContent($method, $args); |
|
70 | + $epesi->add($view)->displayModuleContent($method, $args); |
|
71 | 71 | |
72 | - $epesi->setLocation($view->location()); |
|
72 | + $epesi->setLocation($view->location()); |
|
73 | 73 | |
74 | - return $epesi->response(); |
|
75 | - } |
|
74 | + return $epesi->response(); |
|
75 | + } |
|
76 | 76 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | private static $variables; |
18 | 18 | |
19 | 19 | private static function cache() { |
20 | - if(isset(self::$variables)) return; |
|
20 | + if (isset(self::$variables)) return; |
|
21 | 21 | |
22 | 22 | self::$variables = self::pluck('value', 'name'); |
23 | 23 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public static function get($name, $default = null) { |
26 | 26 | self::cache(); |
27 | 27 | |
28 | - if (! self::$variables->has($name)) return $default; |
|
28 | + if (!self::$variables->has($name)) return $default; |
|
29 | 29 | |
30 | 30 | return self::$variables->get($name, $default)?? $default; |
31 | 31 | } |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | return self::updateOrCreate(compact('name'), compact('value')); |
45 | 45 | } |
46 | 46 | |
47 | - public static function forget($name, $throwError=true) { |
|
47 | + public static function forget($name, $throwError = true) { |
|
48 | 48 | self::cache(); |
49 | 49 | |
50 | - if (! self::$variables->has($name) && $throwError) { |
|
50 | + if (!self::$variables->has($name) && $throwError) { |
|
51 | 51 | throw new \Exception('No such variable in database: ' . $name); |
52 | 52 | } |
53 | 53 |
@@ -17,7 +17,9 @@ discard block |
||
17 | 17 | private static $variables; |
18 | 18 | |
19 | 19 | private static function cache() { |
20 | - if(isset(self::$variables)) return; |
|
20 | + if(isset(self::$variables)) { |
|
21 | + return; |
|
22 | + } |
|
21 | 23 | |
22 | 24 | self::$variables = self::pluck('value', 'name'); |
23 | 25 | } |
@@ -25,7 +27,9 @@ discard block |
||
25 | 27 | public static function get($name, $default = null) { |
26 | 28 | self::cache(); |
27 | 29 | |
28 | - if (! self::$variables->has($name)) return $default; |
|
30 | + if (! self::$variables->has($name)) { |
|
31 | + return $default; |
|
32 | + } |
|
29 | 33 | |
30 | 34 | return self::$variables->get($name, $default)?? $default; |
31 | 35 | } |
@@ -6,37 +6,37 @@ |
||
6 | 6 | |
7 | 7 | class CreateCoreTables extends Migration |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the migrations. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function up() |
|
15 | - { |
|
16 | - $this->down(); |
|
9 | + /** |
|
10 | + * Run the migrations. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function up() |
|
15 | + { |
|
16 | + $this->down(); |
|
17 | 17 | |
18 | - Schema::create('variables', function (Blueprint $table) { |
|
19 | - $table->string('name', 128)->primary(); |
|
20 | - $table->text('value')->nullable(); |
|
21 | - }); |
|
18 | + Schema::create('variables', function (Blueprint $table) { |
|
19 | + $table->string('name', 128)->primary(); |
|
20 | + $table->text('value')->nullable(); |
|
21 | + }); |
|
22 | 22 | |
23 | - Schema::create('modules', function (Blueprint $table) { |
|
24 | - $table->string('class', 512); |
|
25 | - $table->string('alias', 128)->unique(); |
|
26 | - $table->smallInteger('priority')->default(0); |
|
27 | - $table->smallInteger('state')->default(1); |
|
28 | - }); |
|
29 | - } |
|
23 | + Schema::create('modules', function (Blueprint $table) { |
|
24 | + $table->string('class', 512); |
|
25 | + $table->string('alias', 128)->unique(); |
|
26 | + $table->smallInteger('priority')->default(0); |
|
27 | + $table->smallInteger('state')->default(1); |
|
28 | + }); |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Reverse the migrations. |
|
33 | - * |
|
34 | - * @return void |
|
35 | - */ |
|
36 | - public function down() |
|
37 | - { |
|
38 | - Schema::dropIfExists('variables'); |
|
31 | + /** |
|
32 | + * Reverse the migrations. |
|
33 | + * |
|
34 | + * @return void |
|
35 | + */ |
|
36 | + public function down() |
|
37 | + { |
|
38 | + Schema::dropIfExists('variables'); |
|
39 | 39 | |
40 | - Schema::dropIfExists('modules'); |
|
41 | - } |
|
40 | + Schema::dropIfExists('modules'); |
|
41 | + } |
|
42 | 42 | } |
@@ -15,12 +15,12 @@ |
||
15 | 15 | { |
16 | 16 | $this->down(); |
17 | 17 | |
18 | - Schema::create('variables', function (Blueprint $table) { |
|
18 | + Schema::create('variables', function(Blueprint $table) { |
|
19 | 19 | $table->string('name', 128)->primary(); |
20 | 20 | $table->text('value')->nullable(); |
21 | 21 | }); |
22 | 22 | |
23 | - Schema::create('modules', function (Blueprint $table) { |
|
23 | + Schema::create('modules', function(Blueprint $table) { |
|
24 | 24 | $table->string('class', 512); |
25 | 25 | $table->string('alias', 128)->unique(); |
26 | 26 | $table->smallInteger('priority')->default(0); |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | { |
29 | 29 | $modules = ModuleManager::getAll(); |
30 | 30 | |
31 | - return $modules->filter(function ($subModuleClass) use ($modules) { |
|
32 | - return ! $modules->map(function($moduleClass){ |
|
31 | + return $modules->filter(function($subModuleClass) use ($modules) { |
|
32 | + return !$modules->map(function($moduleClass) { |
|
33 | 33 | return $moduleClass::namespace(); |
34 | 34 | })->contains($subModuleClass::parentNamespace()); |
35 | 35 | })->sort(); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | $section->add($label, 'title')->setStyle('float', 'right'); |
62 | 62 | |
63 | - $submodules = ModuleManager::getAll()->filter(function ($subModuleClass) use ($moduleClass) { |
|
63 | + $submodules = ModuleManager::getAll()->filter(function($subModuleClass) use ($moduleClass) { |
|
64 | 64 | return $subModuleClass::isSubModuleOf($moduleClass); |
65 | 65 | }); |
66 | 66 | |
@@ -72,11 +72,11 @@ discard block |
||
72 | 72 | |
73 | 73 | public function formatModuleInfo($moduleClass) |
74 | 74 | { |
75 | - $moduleInfo = (array) ($moduleClass::info()?: __(' No details provided by author')); |
|
75 | + $moduleInfo = (array) ($moduleClass::info() ?: __(' No details provided by author')); |
|
76 | 76 | |
77 | 77 | $ret = []; |
78 | 78 | foreach ($moduleInfo as $label => $text) { |
79 | - $ret[] = (is_string($label)? "<strong>$label</strong>: ": '') . $text; |
|
79 | + $ret[] = (is_string($label) ? "<strong>$label</strong>: " : '') . $text; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | return implode('<br>', $ret); |
@@ -109,12 +109,12 @@ discard block |
||
109 | 109 | |
110 | 110 | $form = $view->add(new Form()); |
111 | 111 | foreach ($recommended as $childModule) { |
112 | - if (! ModuleManager::isAvailable($childModule)) continue; |
|
112 | + if (!ModuleManager::isAvailable($childModule)) continue; |
|
113 | 113 | |
114 | 114 | $form->addField($childModule::alias(), ['CheckBox', 'caption' => $childModule::label()]); |
115 | 115 | } |
116 | 116 | |
117 | - $form->onSubmit(function ($form) use ($moduleClass) { |
|
117 | + $form->onSubmit(function($form) use ($moduleClass) { |
|
118 | 118 | ob_start(); |
119 | 119 | ModuleManager::install($moduleClass, array_keys($form->getValues(), true)); |
120 | 120 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | $view->add(['Button', __('Install'), 'primary'])->on('click', [ |
126 | - isset($form)? $form->submit(): $installCallback |
|
126 | + isset($form) ? $form->submit() : $installCallback |
|
127 | 127 | ]); |
128 | 128 | }); |
129 | 129 |
@@ -51,8 +51,7 @@ discard block |
||
51 | 51 | $this->addUninstallButton($section, $moduleClass); |
52 | 52 | |
53 | 53 | // $this->addReinstallButton($section, $moduleClass); |
54 | - } |
|
55 | - else { |
|
54 | + } else { |
|
56 | 55 | $label = ['Label', __('Available'), 'yellow']; |
57 | 56 | |
58 | 57 | $this->addInstallButton($section, $moduleClass); |
@@ -64,7 +63,9 @@ discard block |
||
64 | 63 | return $subModuleClass::isSubModuleOf($moduleClass); |
65 | 64 | }); |
66 | 65 | |
67 | - if ($submodules->isEmpty()) continue; |
|
66 | + if ($submodules->isEmpty()) { |
|
67 | + continue; |
|
68 | + } |
|
68 | 69 | |
69 | 70 | $this->addAccordion($section, $submodules); |
70 | 71 | } |
@@ -109,7 +110,9 @@ discard block |
||
109 | 110 | |
110 | 111 | $form = $view->add(new Form()); |
111 | 112 | foreach ($recommended as $childModule) { |
112 | - if (! ModuleManager::isAvailable($childModule)) continue; |
|
113 | + if (! ModuleManager::isAvailable($childModule)) { |
|
114 | + continue; |
|
115 | + } |
|
113 | 116 | |
114 | 117 | $form->addField($childModule::alias(), ['CheckBox', 'caption' => $childModule::label()]); |
115 | 118 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | $defaultView = self::module()::view(); |
22 | 22 | |
23 | - $viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView; |
|
23 | + $viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView; |
|
24 | 24 | |
25 | 25 | $viewAlias = null; |
26 | 26 | if ($viewClass !== $defaultView) { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | final public static function moduleLink($module, $method = 'body', $args = []) |
46 | 46 | { |
47 | - $alias = class_exists($module)? $module::alias(): $module; |
|
47 | + $alias = class_exists($module) ? $module::alias() : $module; |
|
48 | 48 | |
49 | 49 | return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)])); |
50 | 50 | } |
@@ -58,13 +58,13 @@ discard block |
||
58 | 58 | * @throws \Illuminate\Http\Exceptions\HttpResponseException |
59 | 59 | */ |
60 | 60 | final public static function decodeArgs($hash) { |
61 | - if (! $hash) return []; |
|
61 | + if (!$hash) return []; |
|
62 | 62 | |
63 | 63 | $args = session($hash); |
64 | 64 | |
65 | 65 | if (is_null($args)) abort(419); |
66 | 66 | |
67 | - return is_array($args)? $args: [$args]; |
|
67 | + return is_array($args) ? $args : [$args]; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | * @return string |
75 | 75 | */ |
76 | 76 | final public static function encodeArgs($args) { |
77 | - $args = is_array($args)? $args: [$args]; |
|
77 | + $args = is_array($args) ? $args : [$args]; |
|
78 | 78 | |
79 | - if (! $args) return; |
|
79 | + if (!$args) return; |
|
80 | 80 | |
81 | 81 | $hash = md5(serialize($args)); |
82 | 82 |
@@ -58,11 +58,15 @@ discard block |
||
58 | 58 | * @throws \Illuminate\Http\Exceptions\HttpResponseException |
59 | 59 | */ |
60 | 60 | final public static function decodeArgs($hash) { |
61 | - if (! $hash) return []; |
|
61 | + if (! $hash) { |
|
62 | + return []; |
|
63 | + } |
|
62 | 64 | |
63 | 65 | $args = session($hash); |
64 | 66 | |
65 | - if (is_null($args)) abort(419); |
|
67 | + if (is_null($args)) { |
|
68 | + abort(419); |
|
69 | + } |
|
66 | 70 | |
67 | 71 | return is_array($args)? $args: [$args]; |
68 | 72 | } |
@@ -76,7 +80,9 @@ discard block |
||
76 | 80 | final public static function encodeArgs($args) { |
77 | 81 | $args = is_array($args)? $args: [$args]; |
78 | 82 | |
79 | - if (! $args) return; |
|
83 | + if (! $args) { |
|
84 | + return; |
|
85 | + } |
|
80 | 86 | |
81 | 87 | $hash = md5(serialize($args)); |
82 | 88 |