From 7392526a5c87a2a3853ccb0b0cb9631d4d8ab5dc Mon Sep 17 00:00:00 2001
From: Murtaza Sultani <sultani@data-quest.de>
Date: Thu, 23 Oct 2025 16:52:34 +0200
Subject: Update getAvatarDropdownHTML API

---
 app/views/admin/user/_results.php  |  6 +++++-
 app/views/contact/index.php        |  6 +++++-
 app/views/course/wiki/allpages.php |  6 +++++-
 app/views/course/wiki/newpages.php |  6 +++++-
 lib/classes/Avatar.php             | 10 ++++------
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/user/_results.php b/app/views/admin/user/_results.php
index 13e5c68..c598b55 100644
--- a/app/views/admin/user/_results.php
+++ b/app/views/admin/user/_results.php
@@ -54,7 +54,11 @@
                 <td style="white-space:nowrap;">
                     <div class="users-table__avatar-container">
                         <input class="check_all" type="checkbox" name="user_ids[]" value="<?= htmlReady($user->id) ?>">
-                        <?= Avatar::getAvatarDropdownHTML($user) ?>
+                        <?= Avatar::getAvatarDropdownHTML([
+                            'id' => $user->id,
+                            'name' => $user->getFullName(),
+                            'username' => $user->username
+                        ], false) ?>
                     </div>
                 </td>
                 <td>
diff --git a/app/views/contact/index.php b/app/views/contact/index.php
index 7c1ff30..a2e00a3 100644
--- a/app/views/contact/index.php
+++ b/app/views/contact/index.php
@@ -54,7 +54,11 @@
                                     <? if (isset($flash['contacts']) && in_array($contact->id, $flash['contacts'])) echo 'checked'; ?>>
                             </td>
                             <td>
-                                <?= Avatar::getAvatarDropdownHTML($contact, true) ?>
+                                <?= Avatar::getAvatarDropdownHTML([
+                                    'id' => $contact->id,
+                                    'name' => $contact->getFullName(),
+                                    'username' => $contact->username
+                                ]) ?>
                             </td>
                             <td class="hidden-small-down">
                                 <a data-dialog="button"
diff --git a/app/views/course/wiki/allpages.php b/app/views/course/wiki/allpages.php
index bbabb67..08ca44d 100644
--- a/app/views/course/wiki/allpages.php
+++ b/app/views/course/wiki/allpages.php
@@ -56,7 +56,11 @@
                 </td>
                 <td data-text="<?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>">
                 <? if ($page->user): ?>
-                    <?= Avatar::getAvatarDropdownHTML($page->user, true) ?>
+                    <?= Avatar::getAvatarDropdownHTML([
+                        'id' => $page->user->id,
+                        'name' => $page->user->getFullName(),
+                        'username' => $page->user->username
+                    ]) ?>
                 <? else: ?>
                     <?= _('unbekannt') ?>
                 <? endif; ?>
diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php
index 8b2663a..fed1a3d 100644
--- a/app/views/course/wiki/newpages.php
+++ b/app/views/course/wiki/newpages.php
@@ -93,7 +93,11 @@
                 <? foreach ($authors as $user_id => $user) : ?>
                     <li>
                     <? if ($user): ?>
-                        <?= Avatar::getAvatarDropdownHTML($user, true) ?>
+                        <?= Avatar::getAvatarDropdownHTML([
+                            'id' => $user->id,
+                            'name' => $user->getFullName(),
+                            'username' => $user->username
+                        ], true) ?>
                     <? else: ?>
                         <?= _('unbekannt') ?>
                     <? endif; ?>
diff --git a/lib/classes/Avatar.php b/lib/classes/Avatar.php
index 28b0ce5..f018104 100644
--- a/lib/classes/Avatar.php
+++ b/lib/classes/Avatar.php
@@ -638,20 +638,18 @@ class Avatar
         return $this->user_id;
     }
 
-    public static function getAvatarDropdownHTML(User $user, bool $with_name = false): string
+    public static function getAvatarDropdownHTML(array $user, bool $with_name = true): string
     {
         $attributes = [
             ':user' => json_encode([
-                'id'         => $user->id,
-                'name'       => $user->getFullName(),
-                'username'   => $user->username,
-                'avatar_url' => self::getAvatar($user->id)->getURL(self::MEDIUM)
+                ...$user,
+                'avatar_url' => self::getAvatar($user['id'])->getURL(self::MEDIUM)
             ])
         ];
 
         $user_profile_link = '';
         if ($with_name) {
-            $user_profile_link = '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $user->username]) . '">' . htmlReady($user->getFullName()) . '</a>';
+            $user_profile_link = '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $user['username']]) . '">' . htmlReady($user['name']) . '</a>';
         }
 
         return '
-- 
cgit v1.0