From 953e74ce8a9a488ecdae7bb58470015309054ff2 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 8 Apr 2023 04:36:26 +0200
Subject: [PATCH] fix billing process

---
 .github/user_bug_report.md                 | 14 +++++++---
 Controller/ApiController.php               | 30 +++++++++++-----------
 Controller/BackendController.php           |  2 +-
 tests/Controller/ApiControllerTest.php     |  2 +-
 tests/Controller/BackendControllerTest.php |  2 +-
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md
index 9e5f2a5..4b92a8e 100755
--- a/.github/user_bug_report.md
+++ b/.github/user_bug_report.md
@@ -8,9 +8,11 @@ assignees: ''
 ---
 
 # Bug Description
+
 A clear and concise description of what the bug is.
 
 # How to Reproduce
+
 Steps to reproduce the behavior:
 
 1. Go to '...'
@@ -19,16 +21,20 @@ Steps to reproduce the behavior:
 4. See error
 
 # Expected Behavior
+
 A clear and concise description of what you expected to happen.
 
 # Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
 # System Information
- - System: [e.g. PC or iPhone11, ...]
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - KarakaVersion [e.g. 22]
+
+- System: [e.g. PC or iPhone11, ...]
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- KarakaVersion [e.g. 22]
 
 # Additional Information
+
 Add any other context about the problem here.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 3267dd1..76c1270 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -71,8 +71,8 @@ final class ApiController extends Controller
     private function validateTaskCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['plain'] = empty($request->getData('plain')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['plain'] = !$request->hasData('plain'))
         ) {
             return $val;
         }
@@ -294,7 +294,7 @@ final class ApiController extends Controller
         $task->setType(TaskType::SINGLE);
         $task->redirect = $request->getDataString('redirect') ?? '';
 
-        if (empty($request->getData('priority'))) {
+        if (!$request->hasData('priority')) {
             $task->due = $request->getDataDateTime('due');
         } else {
             $task->setPriority((int) $request->getData('priority'));
@@ -428,7 +428,7 @@ final class ApiController extends Controller
         if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
             || ($val['due'] = !((bool) \strtotime((string) $request->getData('due'))))
             || ($val['task'] = !(\is_numeric($request->getData('task'))))
-            || ($val['forward'] = !(\is_numeric(empty($request->getData('forward')) ? $request->header->account : $request->getData('forward'))))
+            || ($val['forward'] = !(\is_numeric(!$request->hasData('forward') ? $request->header->account : $request->getData('forward'))))
         ) {
             return $val;
         }
@@ -844,9 +844,9 @@ final class ApiController extends Controller
     private function validateTaskAttributeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['type'] = empty($request->getData('type')))
-            || ($val['value'] = (empty($request->getData('value')) && empty($request->getData('custom'))))
-            || ($val['task'] = empty($request->getData('task')))
+        if (($val['type'] = !$request->hasData('type'))
+            || ($val['value'] = (!$request->hasData('value') && !$request->hasData('custom')))
+            || ($val['task'] = !$request->hasData('task'))
         ) {
             return $val;
         }
@@ -922,8 +922,8 @@ final class ApiController extends Controller
     private function validateTaskAttributeTypeL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['type'] = empty($request->getData('type')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['type'] = !$request->hasData('type'))
         ) {
             return $val;
         }
@@ -999,8 +999,8 @@ final class ApiController extends Controller
     private function validateTaskAttributeTypeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['name'] = empty($request->getData('name')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['name'] = !$request->hasData('name'))
         ) {
             return $val;
         }
@@ -1091,8 +1091,8 @@ final class ApiController extends Controller
     private function validateTaskAttributeValueCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['attributetype'] = empty($request->getData('attributetype')))
-            || ($val['value'] = empty($request->getData('value')))
+        if (($val['attributetype'] = !$request->hasData('attributetype'))
+            || ($val['value'] = !$request->hasData('value'))
         ) {
             return $val;
         }
@@ -1168,8 +1168,8 @@ final class ApiController extends Controller
     private function validateTaskAttributeValueL11nCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['value'] = empty($request->getData('value')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['value'] = !$request->hasData('value'))
         ) {
             return $val;
         }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 1439b70..2fc7b37 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -207,7 +207,7 @@ final class BackendController extends Controller implements DashboardElementInte
             || $task->isCCAccount($accountId)
             || $task->isToAccount($accountId))
             && !$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::TASK, $task->getId())
+                PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->getId())
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->header->status = RequestStatusCode::R_403;
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index b4ce839..4f17cc8 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -65,7 +65,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
 
         $permission = new AccountPermission();
         $permission->setUnit(1);
-        $permission->setApp('backend');
+        $permission->setApp(2);
         $permission->setPermission(
             PermissionType::READ
             | PermissionType::CREATE
diff --git a/tests/Controller/BackendControllerTest.php b/tests/Controller/BackendControllerTest.php
index 55f2633..3f08ebf 100755
--- a/tests/Controller/BackendControllerTest.php
+++ b/tests/Controller/BackendControllerTest.php
@@ -59,7 +59,7 @@ final class BackendControllerTest extends \PHPUnit\Framework\TestCase
 
         $permission = new AccountPermission();
         $permission->setUnit(1);
-        $permission->setApp('backend');
+        $permission->setApp(2);
         $permission->setPermission(
             PermissionType::READ
             | PermissionType::CREATE