Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button

Normalize message button in profile sidebar

mod/display.php

@@ -186,16 +186,7 @@ function display_fetchauthor($a, $item)
 
 	$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
-	if (local_user()) {
+	return $profiledata;
-		if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-			$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
-		}
-	} elseif ($profiledata["network"] == Protocol::DFRN) {
-		$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
-		$profiledata["remoteconnect"] = $connect;
-	}
-
-	return($profiledata);
 }
 
 function display_content(App $a, $update = false, $update_uid = 0)

src/Model/Contact.php

@@ -124,6 +124,20 @@ class Contact extends BaseObject
 		return DBA::toArray($statement);
 	}
 
+	/**
+	 * @param array $fields    Array of selected fields, empty for all
+	 * @param array $condition Array of fields for condition
+	 * @param array $params    Array of several parameters
+	 * @return array
+	 * @throws \Exception
+	 */
+	public static function selectFirst(array $fields = [], array $condition = [], array $params = [])
+	{
+		$contact = DBA::selectFirst('contact', $fields, $condition, $params);
+
+		return $contact;
+	}
+
 	/**
 	 * @param integer $id     Contact ID
 	 * @param array   $fields Array of selected fields, empty for all
@@ -894,7 +908,7 @@ class Contact extends BaseObject
 			// If there is more than one entry we filter out the connector networks
 			if (count($r) > 1) {
 				foreach ($r as $id => $result) {
-					if ($result["network"] == Protocol::STATUSNET) {
+					if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
 						unset($r[$id]);
 					}
 				}
@@ -1078,7 +1092,7 @@ class Contact extends BaseObject
 			$profile_link = $profile_link . '?tab=profile';
 		}
 
-		if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
+		if (self::canReceivePrivateMessages($contact)) {
 			$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
 		}
 
@@ -2356,6 +2370,9 @@ class Contact extends BaseObject
 			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
 		}
 
+		// Prevents endless loop in case only a non-public contact exists for the contact URL
+		unset($data['uid']);
+
 		return self::magicLinkByContact($data, $contact_url);
 	}
 
@@ -2445,4 +2462,18 @@ class Contact extends BaseObject
 		// Is it a forum?
 		return ($contact['forum'] || $contact['prv']);
 	}
+
+	/**
+	 * Can the remote contact receive private messages?
+	 *
+	 * @param array $contact
+	 * @return bool
+	 */
+	public static function canReceivePrivateMessages(array $contact)
+	{
+		$protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
+		$self = $contact['self'] ?? false;
+
+		return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
+	}
 }

src/Model/Profile.php

@@ -18,6 +18,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -117,7 +118,7 @@ class Profile
 
 		if (count($profiledata) > 0) {
 			// Add profile data to sidebar
-			$a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
+			$a->page['aside'] .= self::sidebar($a, $profiledata, true, $show_connect);
 
 			if (!DBA::isResult($user)) {
 				return;
@@ -188,7 +189,7 @@ class Profile
 		 * But: When this profile was on the same server, then we could display the contacts
 		 */
 		if (!$profiledata) {
-			$a->page['aside'] .= self::sidebar($a->profile, $block, $show_connect);
+			$a->page['aside'] .= self::sidebar($a, $a->profile, $block, $show_connect);
 		}
 
 		return;
@@ -280,10 +281,8 @@ class Profile
 	 * @hooks 'profile_sidebar'
 	 *      array $arr
 	 */
-	private static function sidebar($profile, $block = 0, $show_connect = true)
+	private static function sidebar(App $a, $profile, $block = 0, $show_connect = true)
 	{
-		$a = \get_app();
-
 		$o = '';
 		$location = false;
 
@@ -304,127 +303,102 @@ class Profile
 
 		Hook::callAll('profile_sidebar_enter', $profile);
 
+		if (isset($profile['url'])) {
+			$profile_url = $profile['url'];
+		} else {
+			$profile_url = $a->getBaseURL() . '/profile/' . $profile['nickname'];
+		}
 
-		// don't show connect link to yourself
+		$follow_link = null;
-		$connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false;
+		$unfollow_link = null;
+		$subscribe_feed_link = null;
+		$wallmessage_link = null;
 
-		// don't show connect link to authenticated visitors either
+
-		if (remote_user() && !empty($_SESSION['remote'])) {
+
-			foreach ($_SESSION['remote'] as $visitor) {
+		$visitor_contact = [];
-				if ($visitor['uid'] == $profile['uid']) {
+		if ($profile['uid'] && self::getMyURL()) {
-					$connect = false;
+			$visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
-					break;
+		}
+
+		$profile_contact = [];
+		if ($profile['cid'] && self::getMyURL()) {
+			$profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]);
+		}
+
+		$profile_is_dfrn = $profile['network'] == Protocol::DFRN;
+		$profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
+		$local_user_is_self = local_user() && local_user() == ($profile['profile_uid'] ?? 0);
+		$visitor_is_authenticated = (bool)self::getMyURL();
+		$visitor_is_following =
+			in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
+			|| in_array($profile_contact['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND]);
+		$visitor_is_followed =
+			in_array($visitor_contact['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND])
+			|| in_array($profile_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]);
+		$visitor_base_path = self::getMyURL() ? preg_replace('=/profile/(.*)=ism', '', self::getMyURL()) : '';
+
+		if (!$local_user_is_self) {
+			if (!$visitor_is_authenticated) {
+				$follow_link = 'dfrn_request/' . $profile['nickname'];
+			} elseif ($profile_is_native) {
+				if ($visitor_is_following) {
+					$unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+				} else {
+					$follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url);
 				}
 			}
-		}
 
-		if (!$show_connect) {
+			if ($profile_is_dfrn) {
-			$connect = false;
+				$subscribe_feed_link = 'dfrn_poll/' . $profile['nickname'];
-		}
-
-		$profile_url = '';
-
-		// Is the local user already connected to that user?
-		if ($connect && local_user()) {
-			if (isset($profile['url'])) {
-				$profile_url = Strings::normaliseLink($profile['url']);
-			} else {
-				$profile_url = Strings::normaliseLink(System::baseUrl() . '/profile/' . $profile['nickname']);
 			}
 
-			if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
+			if (Contact::canReceivePrivateMessages($profile)) {
-				$connect = false;
+				if ($visitor_is_followed || $visitor_is_following) {
-			}
+					$wallmessage_link = $visitor_base_path . '/message/new/' . base64_encode(defaults($profile, 'addr', ''));
-		}
+				} elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
-
+					$wallmessage_link = 'wallmessage/' . $profile['nickname'];
-		// Is the remote user already connected to that user?
+				}
-		if ($connect && Contact::isFollower(remote_user(), $profile['uid'])) {
-			$connect = false;
-		}
-
-		if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
-			$connect = false;
-		}
-
-		$remoteconnect = null;
-		if (isset($profile['remoteconnect'])) {
-			$remoteconnect = $profile['remoteconnect'];
-		}
-
-		if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) {
-			$subscribe_feed = L10n::t('Atom feed');
-		} else {
-			$subscribe_feed = false;
-		}
-
-		$wallmessage = false;
-		$wallmessage_link = false;
-
-		// See issue https://github.com/friendica/friendica/issues/3838
-		// Either we remove the message link for remote users or we enable creating messages from remote users
-		if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) {
-			$wallmessage = L10n::t('Message');
-
-			if (remote_user()) {
-				$r = q(
-					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
-					intval($profile['uid']),
-					intval(remote_user()),
-					intval(Contact::FRIEND)
-				);
-			} else {
-				$r = q(
-					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
-					intval($profile['uid']),
-					DBA::escape(Strings::normaliseLink(self::getMyURL())),
-					intval(Contact::FRIEND)
-				);
-			}
-			if ($r) {
-				$remote_url = $r[0]['url'];
-				$message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
-				$wallmessage_link = $message_path . base64_encode(defaults($profile, 'addr', ''));
-			} else if (!empty($profile['nickname'])) {
-				$wallmessage_link = 'wallmessage/' . $profile['nickname'];
 			}
 		}
 
 		// show edit profile to yourself
-		if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) {
+		if (!$is_contact && $local_user_is_self) {
-			$profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
+			if (Feature::isEnabled(local_user(), 'multi_profiles')) {
-			$r = q(
+				$profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
-				"SELECT * FROM `profile` WHERE `uid` = %d",
+				$r = q(
-				local_user()
+					"SELECT * FROM `profile` WHERE `uid` = %d",
-			);
+					local_user()
+				);
 
-			$profile['menu'] = [
+				$profile['menu'] = [
-				'chg_photo' => L10n::t('Change profile photo'),
+					'chg_photo' => L10n::t('Change profile photo'),
-				'cr_new' => L10n::t('Create New Profile'),
+					'cr_new' => L10n::t('Create New Profile'),
-				'entries' => [],
+					'entries' => [],
-			];
+				];
 
-			if (DBA::isResult($r)) {
+				if (DBA::isResult($r)) {
-				foreach ($r as $rr) {
+					foreach ($r as $rr) {
-					$profile['menu']['entries'][] = [
+						$profile['menu']['entries'][] = [
-						'photo' => $rr['thumb'],
+							'photo' => $rr['thumb'],
-						'id' => $rr['id'],
+							'id' => $rr['id'],
-						'alt' => L10n::t('Profile Image'),
+							'alt' => L10n::t('Profile Image'),
-						'profile_name' => $rr['profile-name'],
+							'profile_name' => $rr['profile-name'],
-						'isdefault' => $rr['is-default'],
+							'isdefault' => $rr['is-default'],
-						'visibile_to_everybody' => L10n::t('visible to everybody'),
+							'visibile_to_everybody' => L10n::t('visible to everybody'),
-						'edit_visibility' => L10n::t('Edit visibility'),
+							'edit_visibility' => L10n::t('Edit visibility'),
-					];
+						];
+					}
 				}
+			} else {
+				$profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
+				$profile['menu'] = [
+					'chg_photo' => L10n::t('Change profile photo'),
+					'cr_new' => null,
+					'entries' => [],
+				];
 			}
 		}
-		if (!$is_contact && $profile['uid'] == local_user() && !Feature::isEnabled(local_user(), 'multi_profiles')) {
-			$profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
-			$profile['menu'] = [
-				'chg_photo' => L10n::t('Change profile photo'),
-				'cr_new' => null,
-				'entries' => [],
-			];
-		}
 
 		// Fetch the account type
 		$account_type = Contact::getAccountType($profile);
@@ -525,10 +499,13 @@ class Profile
 		$o .= Renderer::replaceMacros($tpl, [
 			'$profile' => $p,
 			'$xmpp' => $xmpp,
-			'$connect' => $connect,
+			'$follow' => L10n::t('Follow'),
-			'$remoteconnect' => $remoteconnect,
+			'$follow_link' => $follow_link,
-			'$subscribe_feed' => $subscribe_feed,
+			'$unfollow' => L10n::t('Unfollow'),
-			'$wallmessage' => $wallmessage,
+			'$unfollow_link' => $unfollow_link,
+			'$subscribe_feed' => L10n::t('Atom feed'),
+			'$subscribe_feed_link' => $subscribe_feed_link,
+			'$wallmessage' => L10n::t('Message'),
 			'$wallmessage_link' => $wallmessage_link,
 			'$account_type' => $account_type,
 			'$location' => $location,
@@ -998,10 +975,7 @@ class Profile
 	 */
 	public static function getMyURL()
 	{
-		if (!empty($_SESSION['my_url'])) {
+		return Session::get('my_url');
-			return $_SESSION['my_url'];
-		}
-		return null;
 	}
 
 	/**

src/Module/Contact.php

@@ -309,6 +309,21 @@ class Contact extends BaseModule
 				$network_link = '';
 			}
 
+			$follow_link = '';
+			$unfollow_link = '';
+			if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+				if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::SHARING, Model\Contact::FRIEND])) {
+					$unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+				} elseif(!$contact['pending']) {
+					$follow_link = 'follow?url=' . urlencode($contact['url']);
+				}
+			}
+
+			$wallmessage_link = '';
+			if ($contact['uid'] && Model\Contact::canReceivePrivateMessages($contact)) {
+				$wallmessage_link = 'message/new/' . $contact['id'];
+			}
+
 			$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
 				'$name'         => $contact['name'],
 				'$photo'        => $contact['photo'],
@@ -316,7 +331,13 @@ class Contact extends BaseModule
 				'$addr'         => defaults($contact, 'addr', ''),
 				'$network_link' => $network_link,
 				'$network'      => L10n::t('Network:'),
-				'$account_type' => Model\Contact::getAccountType($contact)
+				'$account_type' => Model\Contact::getAccountType($contact),
+				'$follow'       => L10n::t('Follow'),
+				'$follow_link'   => $follow_link,
+				'$unfollow'     => L10n::t('Unfollow'),
+				'$unfollow_link' => $unfollow_link,
+				'$wallmessage'  => L10n::t('Message'),
+				'$wallmessage_link' => $wallmessage_link,
 			]);
 
 			$findpeople_widget = '';
@@ -557,19 +578,6 @@ class Contact extends BaseModule
 				$profile_select = ContactSelector::profileAssign($contact['profile-id'], $contact['network'] !== Protocol::DFRN);
 			}
 
-			/// @todo Only show the following link with DFRN when the remote version supports it
-			$follow = '';
-			$follow_text = '';
-			if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
-				if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
-					$follow = $a->getBaseURL(true) . '/unfollow?url=' . urlencode($contact['url']);
-					$follow_text = L10n::t('Disconnect/Unfollow');
-				}
-			} elseif(!$contact['pending']) {
-				$follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']);
-				$follow_text = L10n::t('Connect/Follow');
-			}
-
 			// Load contactact related actions like hide, suggest, delete and others
 			$contact_actions = self::getContactActions($contact);
 
@@ -610,8 +618,6 @@ class Contact extends BaseModule
 				'$updpub'         => L10n::t('Update public posts'),
 				'$last_update'    => $last_update,
 				'$udnow'          => L10n::t('Update now'),
-				'$follow'         => $follow,
-				'$follow_text'    => $follow_text,
 				'$profile_select' => $profile_select,
 				'$contact_id'     => $contact['id'],
 				'$block_text'     => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),
@@ -944,10 +950,6 @@ class Contact extends BaseModule
 
 			$profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
-			if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-				$profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
-			}
-
 			Model\Profile::load($a, '', 0, $profiledata, true);
 			$o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
 		}

view/templates/contact_edit.tpl

@@ -44,11 +44,6 @@
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>
-
-					<ul>
-						<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
-						{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
-					</ul>
 				</div> {{* End of contact-edit-status-wrapper *}}
 
 				{{* Some information about the contact from the profile *}}

view/templates/profile_vcard.tpl

@@ -50,21 +50,20 @@
 	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
 	{{include file="diaspora_vcard.tpl"}}
-	
+
 	<div id="profile-extra-links">
 		<ul>
-			{{if $connect}}
+			{{if $unfollow_link}}
-				{{if $remoteconnect}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-				{{else}}
-					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-				{{/if}}
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
-			{{if $subscribe_feed}}
+			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
 			{{/if}}
 		</ul>
 	</div>

view/templates/widget/vcard.tpl

@@ -10,5 +10,20 @@
 	{{/if}}
 	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 	{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
+
+	<div id="profile-extra-links">
+		<ul>
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
+				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+
 	<div id="profile-vcard-break"></div>
 </div>

view/theme/duepuntozero/templates/profile_vcard.tpl

@@ -36,21 +36,20 @@
 
 	{{include file="diaspora_vcard.tpl"}}
 
-	<div id="profile-vcard-break"></div>	
+	<div id="profile-vcard-break"></div>
 	<div id="profile-extra-links">
 		<ul>
-			{{if $connect}}
+			{{if $unfollow_link}}
-				{{if $remoteconnect}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-				{{else}}
-					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-				{{/if}}
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
-			{{if $subscribe_feed}}
+			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
 			{{/if}}
 		</ul>
 	</div>

view/theme/frio/templates/contact_edit.tpl

@@ -58,11 +58,6 @@
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>
-
-					<ul>
-						<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
-						{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
-					</ul>
 				</div> {{* End of contact-edit-status-wrapper *}}
 
 				<div id="contact-edit-links-end"></div>

view/theme/frio/templates/profile_vcard.tpl

@@ -46,23 +46,24 @@
 			{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
 		</div>
 
+		{{if $follow_link || $unfollow_link || $wallmessage_link}}
 		<div id="profile-extra-links">
-			{{if $connect}}
+			{{if $follow_link || $unfollow_link}}
 			<div id="dfrn-request-link-button">
-				{{if $remoteconnect}}
+				{{if $unfollow_link}}
-				<a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
+				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
-					<span class=""><i class="fa fa-user-plus"></i></span>
+					<span class=""><i class="fa fa-user-times"></i></span>
-					<span class="">{{$connect}}</span>
+					<span class="">{{$unfollow}}</span>
 				</a>
 				{{else}}
-				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
+				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
 					<span class=""><i class="fa fa-user-plus"></i></span>
-					<span class="">{{$connect}}</span>
+					<span class="">{{$follow}}</span>
 				</a>
 				{{/if}}
 			</div>
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $wallmessage_link}}
 			<div id="wallmessage-link-botton">
 				<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
 					<span class=""><i class="fa fa-envelope"></i></span>
@@ -71,6 +72,7 @@
 			</div>
 			{{/if}}
 		</div>
+		{{/if}}
 
 		<div class="clear"></div>
 

view/theme/frio/templates/widget/vcard.tpl

@@ -34,5 +34,30 @@
 
 			{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
 		</div>
+
+		<div id="profile-extra-links">
+			<div id="dfrn-request-link-button">
+				{{if $follow_link}}
+					<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}"">
+						<span class=""><i class="fa fa-user-plus"></i></span>
+						<span class="">{{$follow}}</span>
+					</a>
+				{{/if}}
+				{{if $unfollow_link}}
+					<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
+						<span class=""><i class="fa fa-user-times"></i></span>
+						<span class="">{{$unfollow}}</span>
+					</a>
+				{{/if}}
+			</div>
+			{{if $wallmessage_link}}
+				<div id="wallmessage-link-botton">
+					<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+						<span class=""><i class="fa fa-envelope"></i></span>
+						<span class="">{{$wallmessage}}</span>
+					</button>
+				</div>
+			{{/if}}
+		</div>
 	</div>
 </div>

view/theme/quattro/templates/profile_vcard.tpl

@@ -69,21 +69,20 @@
 	{{/if}}
 
 	{{include file="diaspora_vcard.tpl"}}
-	
+
 	<div id="profile-extra-links">
 		<ul>
-			{{if $connect}}
+			{{if $unfollow_link}}
-				{{if $remoteconnect}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-				{{else}}
-					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-				{{/if}}
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
-			{{if $subscribe_feed}}
+			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
 			{{/if}}
 		</ul>
 	</div>

view/theme/vier/templates/contact_edit.tpl

@@ -45,11 +45,6 @@
 						{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 						{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 					</ul>
-
-					<ul>
-						<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
-						{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
-					</ul>
 				</div> {{* End of contact-edit-status-wrapper *}}
 
 				{{* Some information about the contact from the profile *}}

view/theme/vier/templates/profile_vcard.tpl

@@ -61,21 +61,20 @@
 	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
 	{{include file="diaspora_vcard.tpl"}}
-	
+
 	<div id="profile-extra-links">
 		<ul>
-			{{if $connect}}
+			{{if $unfollow_link}}
-				{{if $remoteconnect}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-				{{else}}
-					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-				{{/if}}
 			{{/if}}
-			{{if $wallmessage}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
 				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
 			{{/if}}
-			{{if $subscribe_feed}}
+			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
 			{{/if}}
 		</ul>
 	</div>