Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-02-14 07:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove whitespace

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-05-21 22:30:04 +02:00
parent b8245da78f
commit c99e0c740b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller.php
View File

@ -86,7 +86,7 @@ final class Controller extends ModuleAbstract implements WebInterface
/** /**
* Create mid navigation * Create mid navigation
* *
* @param int $pageId Page/parent Id for navigation * @param int $pageId Page/parent Id for navigation
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -109,7 +109,7 @@ final class Controller extends ModuleAbstract implements WebInterface
/** /**
* Get basic navigation view * Get basic navigation view
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
* *
@ -136,7 +136,7 @@ final class Controller extends ModuleAbstract implements WebInterface
/** /**
* Load navigation language * Load navigation language
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @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); $nav = Navigation::getInstance($request, $this->app->accountManager->get($request->getHeader()->getAccount()), $this->app->dbPool);
$navView = new NavigationView($this->app, $request, $response); $navView = new NavigationView($this->app, $request, $response);
$navView->setTemplate('/Modules/Navigation/Theme/Backend/splash'); $navView->setTemplate('/Modules/Navigation/Theme/Backend/splash');
$navView->setNav($nav->getNav()); $navView->setNav($nav->getNav());
$navView->setLanguage($request->getHeader()->getL11n()->getLanguage()); $navView->setLanguage($request->getHeader()->getL11n()->getLanguage());

16
Models/Navigation.php
View File

@ -107,17 +107,17 @@ class Navigation
foreach ($tempNav as $id => $link) { foreach ($tempNav as $id => $link) {
$isReadable = $account->hasPermission( $isReadable = $account->hasPermission(
PermissionType::READ, PermissionType::READ,
null, null,
null, null,
(string) $link[0]['nav_from'], (string) $link[0]['nav_from'],
(int) $link[0]['nav_permission_type'], (int) $link[0]['nav_permission_type'],
(int) $link[0]['nav_permission_element'] (int) $link[0]['nav_permission_element']
); );
if ($isReadable) { if ($isReadable) {
$tempNav[$id][0]['readable'] = true; $tempNav[$id][0]['readable'] = true;
$this->setReadable($tempNav, $tempNav[$id][0]['nav_parent']); $this->setReadable($tempNav, $tempNav[$id][0]['nav_parent']);
} }
} }
@ -146,7 +146,7 @@ class Navigation
$nav[$parent][0]['readable'] = true; $nav[$parent][0]['readable'] = true;
if (isset($nav[$nav[$parent][0]['nav_parent']]) 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']) || !$nav[$nav[$parent][0]['nav_parent']][0]['readable'])
) { ) {
$this->setReadable($nav, $nav[$parent][0]['nav_parent']); $this->setReadable($nav, $nav[$parent][0]['nav_parent']);
@ -182,7 +182,7 @@ class Navigation
/** /**
* Get navigation based on account permissions * Get navigation based on account permissions
* *
* @return array * @return array
* *
* @since 1.0.0 * @since 1.0.0