From 77ec99e84502e457be47fa4c089bd38f8f013f4a Mon Sep 17 00:00:00 2001 From: Roman Hergenreder Date: Tue, 23 Jun 2020 16:41:08 +0200 Subject: [PATCH] now really fixed (hopefully) --- core/Api/Request.class.php | 2 +- core/Configuration/CreateDatabase.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Api/Request.class.php b/core/Api/Request.class.php index fda90c0..05cb79b 100644 --- a/core/Api/Request.class.php +++ b/core/Api/Request.class.php @@ -129,7 +129,7 @@ class Request { $this->lastError = 'You are not logged in.'; header('HTTP 1.1 401 Unauthorized'); return false; - } else if(!empty($this->requiredGroup) && empty(array_intersect($this->requiredGroup, $this->user->getGroups()))) { + } else if(!empty($this->requiredGroup) && empty(array_intersect($this->requiredGroup, array_keys($this->user->getGroups())))) { $this->lastError = "Insufficient permissions. Required group: " . implode(", ", array_map(function ($group) { return GroupName($group); }, $this->requiredGroup)); header('HTTP 1.1 401 Unauthorized'); diff --git a/core/Configuration/CreateDatabase.class.php b/core/Configuration/CreateDatabase.class.php index 67e84f4..c889e81 100755 --- a/core/Configuration/CreateDatabase.class.php +++ b/core/Configuration/CreateDatabase.class.php @@ -81,8 +81,8 @@ class CreateDatabase { ->addInt("user_id") ->addInt("group_id") ->unique("user_id", "group_id") - ->foreignKey("user_id", "User", "uid") - ->foreignKey("group_id", "Group", "uid"); + ->foreignKey("user_id", "User", "uid", new CascadeStrategy()) + ->foreignKey("group_id", "Group", "uid", new CascadeStrategy()); $queries[] = $sql->createTable("Notification") ->addSerial("uid")