From 9f800987967a380c223fb1e56a011957f6a4ca94 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 24 Dec 2018 16:53:10 +0300 Subject: [PATCH] check if module files exists --- app/Http/Controllers/Modules/Item.php | 6 ++---- app/Traits/Modules.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 488fa87a1..e329f6e48 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -45,12 +45,10 @@ class Item extends Controller return redirect('apps/home')->send(); } - $check = Module::alias($alias)->first(); - - if ($check) { + if ($this->moduleExists($alias) && ($model = Module::alias($alias)->first())) { $installed = true; - if ($check->status) { + if ($model->status) { $enable = true; } } diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 56681268c..ed5f773a2 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -413,6 +413,17 @@ trait Modules ]; } + public function moduleExists($alias) + { + $status = false; + + if (Module::findByAlias($alias) instanceof \Nwidart\Modules\Module) { + $status = true; + } + + return $status; + } + public function loadSuggestions() { // Get data from cache