From 79c628d91782b50ecfd8175b1494febe385bcbff Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 9 Mar 2018 22:26:22 +0100 Subject: [PATCH] Change permission check from int to string --- Admin/Install/Navigation.install.json | 10 +++++----- Controller.php | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index edeedff..553c2d1 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -10,7 +10,7 @@ "icon": "fa fa-bolt", "order": 15, "from": "Tasks", - "permission": null, + "permission": { "type": null, "element": null }, "parent": 0, "children": [ { @@ -24,7 +24,7 @@ "icon": null, "order": 1, "from": "Tasks", - "permission": null, + "permission": { "type": null, "element": null }, "parent": 1001101001, "children": [ { @@ -38,7 +38,7 @@ "icon": null, "order": 1, "from": "Tasks", - "permission": null, + "permission": { "type": null, "element": null }, "parent": 1001102001, "children": [] } @@ -55,7 +55,7 @@ "icon": null, "order": 10, "from": "Tasks", - "permission": null, + "permission": { "type": null, "element": null }, "parent": 1001101001, "children": [] }, @@ -70,7 +70,7 @@ "icon": null, "order": 20, "from": "Tasks", - "permission": null, + "permission": { "type": null, "element": null }, "parent": 1001101001, "children": [] } diff --git a/Controller.php b/Controller.php index abdfa92..c081c2f 100644 --- a/Controller.php +++ b/Controller.php @@ -112,7 +112,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'); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -175,7 +175,7 @@ class Controller extends ModuleAbstract implements WebInterface || $task->isCc($accountId) || $task->isForwarded($accountId)) && !$this->app->accountManager->get($accountId)->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::TASK, $task->getId()) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK, $task->getId()) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -204,7 +204,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::TASK) + PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $view->setTemplate('/Web/Backend/Error/403_inline'); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -282,7 +282,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskCreate(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::TASK) + PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_create', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -347,7 +347,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskGet(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::TASK) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_read', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -377,7 +377,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ { if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::TASK) + PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_update', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -453,7 +453,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskElementCreate(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::TASK) + PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_element_create', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -509,7 +509,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskElementGet(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::TASK) + PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_read', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403); @@ -539,7 +539,7 @@ class Controller extends ModuleAbstract implements WebInterface public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ { if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::TASK) + PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK) ) { $response->set('task_update', null); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);