From 168af82be0d5b0e276a03cdf6e9193b23b0ba864 Mon Sep 17 00:00:00 2001
From: Murtaza Sultani <sultani@data-quest.de>
Date: Wed, 22 Oct 2025 09:27:46 +0200
Subject: Resolve "Move getAvatarDropdownHTML from User to Avatar"

Closes #5972

Merge request studip/studip!4567
---
 app/views/admin/user/_results.php  |  2 +-
 app/views/contact/index.php        |  2 +-
 app/views/course/wiki/allpages.php |  2 +-
 app/views/course/wiki/newpages.php |  2 +-
 lib/classes/Avatar.php             | 26 ++++++++++++++++++++++++++
 lib/models/User.php                | 26 --------------------------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/views/admin/user/_results.php b/app/views/admin/user/_results.php
index 5f0a47f..13e5c68 100644
--- a/app/views/admin/user/_results.php
+++ b/app/views/admin/user/_results.php
@@ -54,7 +54,7 @@
                 <td style="white-space:nowrap;">
                     <div class="users-table__avatar-container">
                         <input class="check_all" type="checkbox" name="user_ids[]" value="<?= htmlReady($user->id) ?>">
-                        <?= $user->getAvatarDropdownHTML() ?>
+                        <?= Avatar::getAvatarDropdownHTML($user) ?>
                     </div>
                 </td>
                 <td>
diff --git a/app/views/contact/index.php b/app/views/contact/index.php
index bbb28a9..7c1ff30 100644
--- a/app/views/contact/index.php
+++ b/app/views/contact/index.php
@@ -54,7 +54,7 @@
                                     <? if (isset($flash['contacts']) && in_array($contact->id, $flash['contacts'])) echo 'checked'; ?>>
                             </td>
                             <td>
-                                <?= $contact->getAvatarDropdownHTML(true) ?>
+                                <?= Avatar::getAvatarDropdownHTML($contact, true) ?>
                             </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 c1402cc..bbabb67 100644
--- a/app/views/course/wiki/allpages.php
+++ b/app/views/course/wiki/allpages.php
@@ -56,7 +56,7 @@
                 </td>
                 <td data-text="<?= htmlReady($page->user ? $page->user->getFullName() : _('unbekannt')) ?>">
                 <? if ($page->user): ?>
-                    <?= $page->user->getAvatarDropdownHTML(true) ?>
+                    <?= Avatar::getAvatarDropdownHTML($page->user, true) ?>
                 <? else: ?>
                     <?= _('unbekannt') ?>
                 <? endif; ?>
diff --git a/app/views/course/wiki/newpages.php b/app/views/course/wiki/newpages.php
index 7b22683..8b2663a 100644
--- a/app/views/course/wiki/newpages.php
+++ b/app/views/course/wiki/newpages.php
@@ -93,7 +93,7 @@
                 <? foreach ($authors as $user_id => $user) : ?>
                     <li>
                     <? if ($user): ?>
-                        <?= $user->getAvatarDropdownHTML(true) ?>
+                        <?= Avatar::getAvatarDropdownHTML($user, true) ?>
                     <? else: ?>
                         <?= _('unbekannt') ?>
                     <? endif; ?>
diff --git a/lib/classes/Avatar.php b/lib/classes/Avatar.php
index b958655..28b0ce5 100644
--- a/lib/classes/Avatar.php
+++ b/lib/classes/Avatar.php
@@ -637,4 +637,30 @@ class Avatar
     {
         return $this->user_id;
     }
+
+    public static function getAvatarDropdownHTML(User $user, bool $with_name = false): string
+    {
+        $attributes = [
+            ':user' => json_encode([
+                'id'         => $user->id,
+                'name'       => $user->getFullName(),
+                'username'   => $user->username,
+                '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>';
+        }
+
+        return '
+                <div class="user-avatar-container">
+                    <div class="use-vue-components">
+                        <user-avatar-dropdown ' . HTMLAttributes::from($attributes) . '/>
+                    </div>
+                    '. $user_profile_link .'
+                </div>
+        ';
+    }
 }
diff --git a/lib/models/User.php b/lib/models/User.php
index 8015d22..6f7cddb 100644
--- a/lib/models/User.php
+++ b/lib/models/User.php
@@ -1750,30 +1750,4 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
 
         return $GLOBALS['perm']->have_studip_perm($permission, $for_range->id, $this->id);
     }
-
-    public function getAvatarDropdownHTML(bool $with_name = false): string
-    {
-        $attributes = [
-            ':user' => json_encode([
-                'id'         => $this->id,
-                'name'       => $this->getFullName(),
-                'username'   => $this->username,
-                'avatar_url' => Avatar::getAvatar($this->id)->getURL(Avatar::MEDIUM)
-            ])
-        ];
-
-        $user_profile_link = '';
-        if ($with_name) {
-            $user_profile_link = '<a href="' . URLHelper::getLink('dispatch.php/profile', ['username' => $this->username]) . '">' . htmlReady($this->getFullName()) . '</a>';
-        }
-
-        return '
-                <div class="user-avatar-container">
-                    <div class="use-vue-components">
-                        <user-avatar-dropdown ' . HTMLAttributes::from($attributes) . '/>
-                    </div>
-                    '. $user_profile_link .'
-                </div>
-        ';
-    }
 }
-- 
cgit v1.0