From 6736187be6c302643caac8fd2744a2c181192728 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 7 Oct 2023 22:06:47 -0400
Subject: [PATCH] Normalize template variables in Widget\VCard

- Display new links in vier
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1751750581
---
 src/Content/Widget/VCard.php               | 18 ++++++++++--------
 view/templates/widget/vcard.tpl            |  6 ++++++
 view/theme/frio/templates/widget/vcard.tpl | 16 ++++++++--------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php
index d57f7130f9..1d5cde87b4 100644
--- a/src/Content/Widget/VCard.php
+++ b/src/Content/Widget/VCard.php
@@ -68,6 +68,8 @@ class VCard
 		$follow_link      = '';
 		$unfollow_link    = '';
 		$wallmessage_link = '';
+		$mention_label    = '';
+		$mention_link     = '';
 		$showgroup_link   = '';
 
 		$photo   = Contact::getPhoto($contact);
@@ -102,15 +104,13 @@ class VCard
 			}
 
 			if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
-				$mention_label   = DI::l10n()->t('Post to group');
-				$mention_url     = 'compose/0?body=!' . $contact['addr'];
-				$showgroup_label = DI::l10n()->t('View group');
-				$showgroup_url   = 'network/group/' . $id;
+				$mention_label  = DI::l10n()->t('Post to group');
+				$mention_link   = 'compose/0?body=!' . $contact['addr'];
+				$showgroup_link = 'network/group/' . $id;
 			} else {
 				$mention_label = DI::l10n()->t('Mention');
-				$mention_url   = 'compose/0?body=@' . $contact['addr'];
+				$mention_link  = 'compose/0?body=@' . $contact['addr'];
 			}
-
 		}
 
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
@@ -131,8 +131,10 @@ class VCard
 			'$unfollow_link'    => $unfollow_link,
 			'$wallmessage'      => DI::l10n()->t('Message'),
 			'$wallmessage_link' => $wallmessage_link,
-			'$mention'          => [$mention_label, $mention_url],
-			'$showgroup'        => [$showgroup_label, $showgroup_url]
+			'$mention'          => $mention_label,
+			'$mention_link'     => $mention_link,
+			'$showgroup'        => DI::l10n()->t('View group'),
+			'$showgroup_link'   => $showgroup_link,
 		]);
 	}
 }
diff --git a/view/templates/widget/vcard.tpl b/view/templates/widget/vcard.tpl
index 9e38eebfc5..2656be487e 100644
--- a/view/templates/widget/vcard.tpl
+++ b/view/templates/widget/vcard.tpl
@@ -41,6 +41,12 @@
 			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
+			{{if $mention_link}}
+				<li><a id="mention-link" href="{{$mention_link}}">{{$mention}}</a></li>
+			{{/if}}
+			{{if $showgroup_link}}
+				<li><a id="showgroup-link" href="{{$showgroup_link}}">{{$showgroup}}</a></li>
+			{{/if}}
 		</ul>
 	</div>
 
diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl
index 814dec49ed..9f030a8ef0 100644
--- a/view/theme/frio/templates/widget/vcard.tpl
+++ b/view/theme/frio/templates/widget/vcard.tpl
@@ -56,22 +56,22 @@
 					</button>
 				</div>
 			{{/if}}
-                        {{if $contact.addr}}
+			{{if $mention_link}}
 				<div id="mention-link-button">
-					<button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention.1}}')" titel="{{$mention.0}}" aria-label="{{$mention.0}}">
+					<button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention_link}}')" title="{{$mention}}" aria-label="{{$mention}}">
 						<span class=""><i class="fa fa-pencil-square-o"></i></span>
-						<span class="">{{$mention.0}}</span>
+						<span class="">{{$mention}}</span>
 					</button>
 				</div>
-                        {{/if}}
-                        {{if $contact.forum==1 || $contact.prv==1}}
+			{{/if}}
+			{{if $showgroup_link}}
 				<div id="show-group-button">
-					<button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup.1}}'">
+					<button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup_link}}'" title="{{$showgroup}}" aria-label="{{$showgroup}}">
 						<span class=""><i class="fa fa-group"></i></span>
-						<span class="">{{$showgroup.0}}</span>
+						<span class="">{{$showgroup}}</span>
 					</button>
 				</div>
-                        {{/if}}
+			{{/if}}
 		</div>
 
 		<div class="clear"></div>