From 6bf0396c76cde35d98444d7d30efa2ceb49f63ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maurice=20Preu=C3=9F=20=28envoyr=29?= <envoyr@froxlor.org>
Date: Sun, 25 Dec 2022 20:42:34 +0100
Subject: [PATCH] fix user details in form fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
---
 lib/Froxlor/UI/Callbacks/Text.php | 2 +-
 lib/Froxlor/User.php              | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Froxlor/UI/Callbacks/Text.php b/lib/Froxlor/UI/Callbacks/Text.php
index eb85a376..a1439558 100644
--- a/lib/Froxlor/UI/Callbacks/Text.php
+++ b/lib/Froxlor/UI/Callbacks/Text.php
@@ -42,7 +42,7 @@ class Text
 
 	public static function customerfullname(array $attributes): string
 	{
-		return User::getCorrectFullUserDetails($attributes['fields']);
+		return User::getCorrectFullUserDetails($attributes['fields'], true);
 	}
 
 	public static function size(array $attributes): string
diff --git a/lib/Froxlor/User.php b/lib/Froxlor/User.php
index 5ad88a8b..c2f7857f 100644
--- a/lib/Froxlor/User.php
+++ b/lib/Froxlor/User.php
@@ -38,7 +38,7 @@ class User
 	 *
 	 * @author Florian Lippert <flo@syscp.org> (2003-2009)
 	 */
-	public static function getCorrectFullUserDetails($userinfo)
+	public static function getCorrectFullUserDetails($userinfo, $html = false): string
 	{
 		$returnval = '';
 
@@ -47,7 +47,11 @@ class User
 				$returnval = $userinfo['name'] . ', ' . $userinfo['firstname'];
 			} else {
 				if ($userinfo['name'] != '' && $userinfo['firstname'] != '') {
-					$returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . '<br><small>' . $userinfo['company'] . '</small>';
+					if ($html) {
+						$returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . '<br><small>' . $userinfo['company'] . '</small>';
+					} else {
+						$returnval = $userinfo['name'] . ', ' . $userinfo['firstname'] . ', ' . $userinfo['company'];
+					}
 				} else {
 					$returnval = $userinfo['company'];
 				}