From c1e72f011f5abc73d96deefea16cc5fa07d771f6 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 9 Mar 2018 22:26:22 +0100
Subject: [PATCH] Change permission check from int to string

---
 Admin/Install/Navigation.install.json |  8 ++++----
 Controller.php                        | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 398d1d8..912eda0 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -10,7 +10,7 @@
         "icon": null,
         "order": 50,
         "from": "Knowledgebase",
-        "permission": null,
+        "permission": { "type": null, "element": null },
         "parent": 1003301001,
         "children": [
             {
@@ -24,7 +24,7 @@
                 "icon": null,
                 "order": 1,
                 "from": "Knowledgebase",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1005901001,
                 "children": []
             },
@@ -39,7 +39,7 @@
                 "icon": null,
                 "order": 5,
                 "from": "Knowledgebase",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1005901001,
                 "children": []
             },
@@ -54,7 +54,7 @@
                 "icon": null,
                 "order": 5,
                 "from": "Knowledgebase",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1005901001,
                 "children": []
             }
diff --git a/Controller.php b/Controller.php
index 62a74bf..a8c6078 100644
--- a/Controller.php
+++ b/Controller.php
@@ -125,7 +125,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DASHBOARD)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             return $view;
@@ -155,7 +155,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DASHBOARD)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             return $view;
@@ -185,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DASHBOARD)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             return $view;
@@ -262,7 +262,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $accountId = $request->getHeader()->getAccount();
 
         if (!$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC, $category->getId())
+                PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC, $category->getId())
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -291,7 +291,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -309,7 +309,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiWikiDocCreate(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC)
         ) {
             $response->set('wiki_doc_create', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);