From e60aa0acd1f32c77505400f79eb249659912b66f 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 | 20 ++++++-------
 Controller.php                        | 42 +++++++++++++--------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 05ae75b..727083d 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -10,7 +10,7 @@
         "icon": "fa fa-database",
         "order": 2,
         "from": "Organization",
-        "permission": null,
+        "permission": { "type": null, "element": null },
         "parent": 0,
         "children": [
             {
@@ -24,7 +24,7 @@
                 "icon": null,
                 "order": 1,
                 "from": "Organization",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1004701001,
                 "children": [
                     {
@@ -38,7 +38,7 @@
                         "icon": null,
                         "order": 5,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004702001,
                         "children": []
                     },
@@ -53,7 +53,7 @@
                         "icon": null,
                         "order": 25,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004702001,
                         "children": []
                     }
@@ -70,7 +70,7 @@
                 "icon": null,
                 "order": 5,
                 "from": "Organization",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1004701001,
                 "children": [
                     {
@@ -84,7 +84,7 @@
                         "icon": null,
                         "order": 5,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004703001,
                         "children": []
                     },
@@ -99,7 +99,7 @@
                         "icon": null,
                         "order": 25,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004703001,
                         "children": []
                     }
@@ -116,7 +116,7 @@
                 "icon": null,
                 "order": 20,
                 "from": "Organization",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1004701001,
                 "children": [
                     {
@@ -130,7 +130,7 @@
                         "icon": null,
                         "order": 5,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004704001,
                         "children": []
                     },
@@ -145,7 +145,7 @@
                         "icon": null,
                         "order": 25,
                         "from": "Organization",
-                        "permission": null,
+                        "permission": { "type": null, "element": null },
                         "parent": 1004704001,
                         "children": []
                     }
diff --git a/Controller.php b/Controller.php
index 865c223..2d177be 100644
--- a/Controller.php
+++ b/Controller.php
@@ -108,7 +108,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::UNIT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -138,7 +138,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::UNIT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -168,7 +168,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::UNIT)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -196,7 +196,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::DEPARTMENT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -226,7 +226,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::DEPARTMENT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -256,7 +256,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::DEPARTMENT)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -284,7 +284,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::POSITION)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -314,7 +314,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::POSITION)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -344,7 +344,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::POSITION)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -399,7 +399,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiUnitGet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::UNIT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $response->set('unit_read', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -429,7 +429,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiUnitSet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::UNIT)
+            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $response->set('unit_update', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -484,7 +484,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiUnitDelete(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::UNIT)
+            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $response->set('unit_delete', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -516,7 +516,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiUnitCreate(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::UNIT)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::UNIT)
         ) {
             $response->set('unit_create', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -605,7 +605,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiPositionGet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::POSITION)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $response->set('position_read', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -635,7 +635,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiPositionDelete(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::POSITION)
+            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $response->set('position_delete', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -667,7 +667,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiPositionSet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::POSITION)
+            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $response->set('position_update', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -725,7 +725,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiPositionCreate(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::POSITION)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::POSITION)
         ) {
             $response->set('position_create', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -816,7 +816,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiDepartmentGet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DEPARTMENT)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $response->set('department_read', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -846,7 +846,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiDepartmentSet(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DEPARTMENT)
+            PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $response->set('department_update', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -905,7 +905,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiDepartmentDelete(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DEPARTMENT)
+            PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $response->set('department_delete', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -937,7 +937,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiDepartmentCreate(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::DEPARTMENT)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DEPARTMENT)
         ) {
             $response->set('department_create', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);