From 762387db584d94c2272ec9b0ae2129723fd5b49d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 8 Apr 2023 04:36:25 +0200 Subject: [PATCH] fix billing process --- .github/user_bug_report.md | 14 ++++++++++---- Controller/ApiController.php | 6 +++--- Controller/BackendController.php | 4 ++-- tests/Controller/ApiControllerTest.php | 2 +- 4 files changed, 16 insertions(+), 10 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 c5bdf27..58b3043 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -307,8 +307,8 @@ final class ApiController extends Controller private function validateCommentCreate(RequestAbstract $request) : array { $val = []; - if (($val['plain'] = empty($request->getData('plain'))) - || ($val['list'] = empty($request->getData('list'))) + if (($val['plain'] = !$request->hasData('plain')) + || ($val['list'] = !$request->hasData('list')) ) { return $val; } @@ -477,7 +477,7 @@ final class ApiController extends Controller private function validateCommentVote(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) || ($val['type'] = ($request->getDataInt('type') < -1 || $request->getDataInt('type') > 1)) ) { return $val; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 14db51a..32de6c4 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -109,8 +109,8 @@ final class BackendController extends Controller private function validateCommentCreate(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; } diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index c6ec2a5..8d8b376 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -72,7 +72,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $permission = new AccountPermission(); $permission->setUnit(1); - $permission->setApp('backend'); + $permission->setApp(2); $permission->setPermission( PermissionType::READ | PermissionType::CREATE