Merge branch 'main' into develop

cerebrate-project · Sep 16, 2024 · 72d821a · 72d821a
2 parents de39176 + 4f42d50
commit 72d821a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ For installation via docker, refer to the [cerebrate-docker](https://github.com/
 ~~~~
     The software is released under the AGPLv3.
 
-    Copyright (C) 2019, 2021  Andras Iklody
-    Copyright (C) 2020-2021 Sami Mokaddem
+    Copyright (C) 2019-2024  Andras Iklody
+    Copyright (C) 2020-2024 Sami Mokaddem
     Copyright (C) CIRCL - Computer Incident Response Center Luxembourg
 ~~~~
diff --git a/src/Controller/Component/NavigationComponent.php b/src/Controller/Component/NavigationComponent.php
@@ -74,8 +74,13 @@ public function getUserBookmarks(): array
         $userSettingTable = TableRegistry::getTableLocator()->get('UserSettings');
         $setting = $userSettingTable->getSettingByName($this->request->getAttribute('identity'), 'ui.bookmarks');
         $bookmarks = is_null($setting) ? [] : json_decode($setting->value, true);
-
+        if (empty($bookmarks)) {
+            return [];
+        }
         $links = array_map(function($bookmark) {
+            if (!isset($bookmark['name']) || !isset($bookmark['label']) || !isset($bookmark['url'])) {
+                return [];
+            }
             return [
                 'name' => $bookmark['name'],
                 'label' => $bookmark['label'],