diff options
| author | Udo Walter | 2017-11-21 17:52:04 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
| commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
| tree | 42f267c360104b98d2e3199273adba62a1e2023b /inc/module.inc.php | |
| parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip | |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'inc/module.inc.php')
| -rw-r--r-- | inc/module.inc.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/inc/module.inc.php b/inc/module.inc.php index 7211c68c..ec3d095b 100644 --- a/inc/module.inc.php +++ b/inc/module.inc.php @@ -29,12 +29,14 @@ class Module * @param string $moduleId module to check * @return bool true if module is available and activated */ - public static function isAvailable($moduleId) + public static function isAvailable($moduleId, $activate = true) { $module = self::get($moduleId); if ($module === false) return false; - $module->activate(); + if ($activate) { + $module->activate(); + } return !$module->hasMissingDependencies(); } @@ -56,7 +58,7 @@ class Module $mod->depsChecked = true; foreach ($mod->dependencies as $dep) { if (!self::resolveDepsByName($dep)) { - error_log("Disabling module {$mod->name}: Dependency $dep failed."); + trigger_error("Disabling module {$mod->name}: Dependency $dep failed.", E_USER_WARNING); $mod->depsMissing = true; return false; } @@ -75,9 +77,9 @@ class Module foreach (self::$modules as $module) { if (self::resolveDeps($module)) { $ret[] = $module; - } - if ($sortById) { - $sort[] = $module->name; + if ($sortById) { + $sort[] = $module->name; + } } } if ($sortById) { |