Merge branch 'main' into issue-3911issue-3911

10 files changed, 10 insertions, 26 deletions

diff --git a/lib/classes/sidebar/AttributesArrayAccessTrait.php b/lib/classes/sidebar/AttributesArrayAccessTrait.php
index 7bea834..09fc030 100644
--- a/lib/classes/sidebar/AttributesArrayAccessTrait.php
+++ b/lib/classes/sidebar/AttributesArrayAccessTrait.php
@@ -3,41 +3,25 @@ trait AttributesArrayAccessTrait
 {
     public $attributes = [];
 
-    /**
-     * @todo Add bool return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->attributes[$offset]);
     }
 
     /**
-     * @param $offset
-     * @return mixed
-     *
-     * @todo Add mixed return type when Stud.IP requires PHP8 minimal
+     * @param string $offset
      */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->attributes[$offset];
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->attributes[$offset] = $value;
     }
 
-    /**
-     * @todo Add void return type when Stud.IP requires PHP8 minimal
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->attributes[$offset]);
     }
diff --git a/lib/classes/sidebar/ClipboardWidget.class.php b/lib/classes/sidebar/ClipboardWidget.php
index abc0d6c..abc0d6c 100644
--- a/lib/classes/sidebar/ClipboardWidget.class.php
+++ b/lib/classes/sidebar/ClipboardWidget.php
diff --git a/lib/classes/sidebar/InstituteSelectWidget.class.php b/lib/classes/sidebar/InstituteSelectWidget.php
index ec05311..ec05311 100644
--- a/lib/classes/sidebar/InstituteSelectWidget.class.php
+++ b/lib/classes/sidebar/InstituteSelectWidget.php
diff --git a/lib/classes/sidebar/LinksWidget.php b/lib/classes/sidebar/LinksWidget.php
index bc8256d..72a2fca 100644
--- a/lib/classes/sidebar/LinksWidget.php
+++ b/lib/classes/sidebar/LinksWidget.php
@@ -30,7 +30,7 @@ class LinksWidget extends ListWidget
     public function &addLink($label, $url, $icon = null, $attributes = [], $index = null)
     {
         if ($index === null) {
-            $index = 'link-' . md5($url);
+            $index = 'link-' . md5($url . $label);
         }
         $element = new LinkElement($label, $url, $icon, $attributes);
         $this->addElement($element, $index);
diff --git a/lib/classes/sidebar/ResourceTreeWidget.class.php b/lib/classes/sidebar/ResourceTreeWidget.php
index 60d4b29..60d4b29 100644
--- a/lib/classes/sidebar/ResourceTreeWidget.class.php
+++ b/lib/classes/sidebar/ResourceTreeWidget.php
diff --git a/lib/classes/sidebar/RoomClipboardWidget.class.php b/lib/classes/sidebar/RoomClipboardWidget.php
index 3d90c36..3d90c36 100644
--- a/lib/classes/sidebar/RoomClipboardWidget.class.php
+++ b/lib/classes/sidebar/RoomClipboardWidget.php
diff --git a/lib/classes/sidebar/RoomSearchTreeWidget.class.php b/lib/classes/sidebar/RoomSearchTreeWidget.php
index c3aaa07..c3aaa07 100644
--- a/lib/classes/sidebar/RoomSearchTreeWidget.class.php
+++ b/lib/classes/sidebar/RoomSearchTreeWidget.php
diff --git a/lib/classes/sidebar/RoomSearchWidget.class.php b/lib/classes/sidebar/RoomSearchWidget.php
index 1fa465f..1fa465f 100644
--- a/lib/classes/sidebar/RoomSearchWidget.class.php
+++ b/lib/classes/sidebar/RoomSearchWidget.php
diff --git a/lib/classes/sidebar/Sidebar.php b/lib/classes/sidebar/Sidebar.php
index 65fc62d..ba1e609 100644
--- a/lib/classes/sidebar/Sidebar.php
+++ b/lib/classes/sidebar/Sidebar.php
@@ -186,7 +186,7 @@ class Sidebar extends WidgetContainer
         static $actions_widget_added = false;
 
 
-        if ($widget instanceof NavigationWidget && !$navigation_widget_added) {
+        if ($widget instanceof NavigationWidget && !$navigation_widget_added && $widget->hasElements()) {
             SkipLinks::addIndex(
                 _('Dritte Navigationsebene'),
                 $widget->getId(),
@@ -197,7 +197,7 @@ class Sidebar extends WidgetContainer
             $navigation_widget_added = true;
         }
 
-        if ($widget instanceof ActionsWidget && !$actions_widget_added) {
+        if ($widget instanceof ActionsWidget && !$actions_widget_added && $widget->hasElements()) {
             if (!$widget->getId()) {
                 $widget->setId('sidebar-actions');
             }
diff --git a/lib/classes/sidebar/TemplateWidget.php b/lib/classes/sidebar/TemplateWidget.php
index c937c3b..2ca2d70 100644
--- a/lib/classes/sidebar/TemplateWidget.php
+++ b/lib/classes/sidebar/TemplateWidget.php
@@ -15,10 +15,10 @@ class TemplateWidget extends SidebarWidget
      * Constructor of the widget.
      *
      * @param String         $title     Title of the widget
-     * @param Flexi_Template $template  Template for the widget
+     * @param Flexi\Template $template  Template for the widget
      * @param array          $variables Associated variables for the template
      */
-    public function __construct($title, Flexi_Template $template, array $variables = [])
+    public function __construct($title, Flexi\Template $template, array $variables = [])
     {
         parent::__construct();