From b45cc8ae221c798be65660ba5a1fdc128391986d Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sat, 16 Nov 2024 15:27:10 +0100
Subject: [PATCH 1/3] fix: Set proxy settings diagonistics severity level to
 info. fix #176

---
 src/Model/Table/SettingProviders/CerebrateSettingsProvider.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Model/Table/SettingProviders/CerebrateSettingsProvider.php b/src/Model/Table/SettingProviders/CerebrateSettingsProvider.php
index 256b3a96..30cf7a30 100644
--- a/src/Model/Table/SettingProviders/CerebrateSettingsProvider.php
+++ b/src/Model/Table/SettingProviders/CerebrateSettingsProvider.php
@@ -136,12 +136,14 @@ protected function generateSettingsConfiguration()
                     'Proxy' => [
                         'Proxy.host' => [
                             'name' => __('Host'),
+			    'severity' => 'info',
                             'type' => 'string',
                             'description' => __('The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy.'),
                             'test' => 'testHostname',
                         ],
                         'Proxy.port' => [
                             'name' => __('Port'),
+			    'severity' => 'info',
                             'type' => 'integer',
                             'description' => __('The TCP port for the HTTP proxy.'),
                             'test' => 'testForRangeXY',

From 850d559cef2ba59e5cc1719dd78dbd1105c76506 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Fri, 22 Nov 2024 22:40:25 +0100
Subject: [PATCH 2/3] fix: typo in read security allowed bookmark domains
 config

---
 src/Model/Table/UserSettingsTable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/Table/UserSettingsTable.php b/src/Model/Table/UserSettingsTable.php
index 0bbde9a4..0fc1dcc9 100644
--- a/src/Model/Table/UserSettingsTable.php
+++ b/src/Model/Table/UserSettingsTable.php
@@ -103,7 +103,7 @@ public function saveBookmark($user, $data)
             'name' => $data['bookmark_name'],
             'url' => $data['bookmark_url'],
         ];
-        $restricted_domains = Configure::read('Security.restrictions.allowed_bookmark_domains');
+        $restricted_domains = Configure::read('security.restrictions.allowed_bookmark_domains');
         if (!empty($restricted_domains)) {
             $restricted_domains = explode(',', $restricted_domains);
             $parsed = parse_url($bookmarkData['url']);

From a1020bc42b2279e5033f1b6d81b0e35c01424e39 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Fri, 22 Nov 2024 23:48:52 +0100
Subject: [PATCH 3/3] fix: users settings view throws internal server error
 when accessed without user id

---
 src/Controller/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index 4159d961..238920aa 100644
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -487,7 +487,7 @@ public function settings($user_id=false)
     {
         $editingAnotherUser = false;
         $currentUser = $this->ACL->getUser();
-        if ((empty($currentUser['role']['perm_community_admin']) && empty($currentUser['role']['perm_group_admin'])) || $user_id == $currentUser->id) {
+        if ((empty($currentUser['role']['perm_community_admin']) && empty($currentUser['role']['perm_group_admin'])) || empty($user_id) || $user_id == $currentUser->id) {
             $user = $currentUser;
         } else {
             $user = $this->Users->get($user_id, [