ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Move to int values for permission type checks

Browse Source
This commit is contained in:
Julius Haertl
2017-02-03 18:38:01 +01:00
parent dfe8bad832
commit 0333f31b9a
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/Acl.php
View File

@@ -83,10 +83,6 @@ class Acl extends RelationalEntity implements \JsonSerializable {
]; ];
} }
/*
* FIXME: migrate other code to const PERMISSION_TYPE_ instead of strings
* iirc js uses those strings as well
*/
public function getTypeString() { public function getTypeString() {
if ($this->type === Acl::PERMISSION_TYPE_GROUP) { if ($this->type === Acl::PERMISSION_TYPE_GROUP) {
return 'group'; return 'group';

4
lib/Service/PermissionService.php
View File

@@ -127,14 +127,14 @@ class PermissionService {
public function userCan(array $acls, $permission) { public function userCan(array $acls, $permission) {
// check for users // check for users
foreach ($acls as $acl) { foreach ($acls as $acl) {
if ($acl->getType() === "user" && $acl->getParticipant() === $this->userId) { if ($acl->getType() === Acl::PERMISSION_TYPE_USER && $acl->getParticipant() === $this->userId) {
return $acl->getPermission($permission); return $acl->getPermission($permission);
} }
} }
// check for groups // check for groups
$hasGroupPermission = false; $hasGroupPermission = false;
foreach ($acls as $acl) { foreach ($acls as $acl) {
if (!$hasGroupPermission && $acl->getType() === "group" && $this->groupManager->isInGroup($this->userId, $acl->getParticipant())) { if (!$hasGroupPermission && $acl->getType() === Acl::PERMISSION_TYPE_GROUP && $this->groupManager->isInGroup($this->userId, $acl->getParticipant())) {
$hasGroupPermission = $acl->getPermission($permission); $hasGroupPermission = $acl->getPermission($permission);
} }
} }