diff --git a/Controller.php b/Controller.php index 3553607..a4c104e 100644 --- a/Controller.php +++ b/Controller.php @@ -86,7 +86,7 @@ final class Controller extends ModuleAbstract implements WebInterface /** * Create mid navigation - * + * * @param int $pageId Page/parent Id for navigation * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -109,7 +109,7 @@ final class Controller extends ModuleAbstract implements WebInterface /** * Get basic navigation view - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @@ -136,7 +136,7 @@ final class Controller extends ModuleAbstract implements WebInterface /** * Load navigation language - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @@ -175,7 +175,7 @@ final class Controller extends ModuleAbstract implements WebInterface { $nav = Navigation::getInstance($request, $this->app->accountManager->get($request->getHeader()->getAccount()), $this->app->dbPool); $navView = new NavigationView($this->app, $request, $response); - + $navView->setTemplate('/Modules/Navigation/Theme/Backend/splash'); $navView->setNav($nav->getNav()); $navView->setLanguage($request->getHeader()->getL11n()->getLanguage()); diff --git a/Models/Navigation.php b/Models/Navigation.php index e48cd7c..1c532cf 100644 --- a/Models/Navigation.php +++ b/Models/Navigation.php @@ -107,17 +107,17 @@ class Navigation foreach ($tempNav as $id => $link) { $isReadable = $account->hasPermission( - PermissionType::READ, - null, - null, - (string) $link[0]['nav_from'], - (int) $link[0]['nav_permission_type'], + PermissionType::READ, + null, + null, + (string) $link[0]['nav_from'], + (int) $link[0]['nav_permission_type'], (int) $link[0]['nav_permission_element'] ); if ($isReadable) { $tempNav[$id][0]['readable'] = true; - + $this->setReadable($tempNav, $tempNav[$id][0]['nav_parent']); } } @@ -146,7 +146,7 @@ class Navigation $nav[$parent][0]['readable'] = true; if (isset($nav[$nav[$parent][0]['nav_parent']]) - && (!isset($nav[$nav[$parent][0]['nav_parent']][0]['readable']) + && (!isset($nav[$nav[$parent][0]['nav_parent']][0]['readable']) || !$nav[$nav[$parent][0]['nav_parent']][0]['readable']) ) { $this->setReadable($nav, $nav[$parent][0]['nav_parent']); @@ -182,7 +182,7 @@ class Navigation /** * Get navigation based on account permissions - * + * * @return array * * @since 1.0.0