$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
- if (local_user()) {
- 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);
+ return $profiledata;
}
function display_content(App $a, $update = false, $update_uid = 0)
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
// 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]);
}
}
$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'];
}
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);
}
// 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;
+ }
}
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;
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;
* 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;
* @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;
Hook::callAll('profile_sidebar_enter', $profile);
-
- // don't show connect link to yourself
- $connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false;
-
- // don't show connect link to authenticated visitors either
- if (remote_user() && !empty($_SESSION['remote'])) {
- foreach ($_SESSION['remote'] as $visitor) {
- if ($visitor['uid'] == $profile['uid']) {
- $connect = false;
- break;
- }
- }
- }
-
- if (!$show_connect) {
- $connect = false;
+ if (isset($profile['url'])) {
+ $profile_url = $profile['url'];
+ } else {
+ $profile_url = $a->getBaseURL() . '/profile/' . $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])) {
- $connect = false;
- }
- }
+ $follow_link = null;
+ $unfollow_link = null;
+ $subscribe_feed_link = null;
+ $wallmessage_link = null;
- // 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'];
+ $visitor_contact = [];
+ if ($profile['uid'] && self::getMyURL()) {
+ $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
}
- if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) {
- $subscribe_feed = L10n::t('Atom feed');
- } else {
- $subscribe_feed = false;
+ $profile_contact = [];
+ if ($profile['cid'] && self::getMyURL()) {
+ $profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]);
}
- $wallmessage = false;
- $wallmessage_link = false;
+ $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()) : '';
- // 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 (!$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 (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 ($profile_is_dfrn) {
+ $subscribe_feed_link = 'dfrn_poll/' . $profile['nickname'];
}
- 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'];
+
+ if (Contact::canReceivePrivateMessages($profile)) {
+ 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'];
+ }
}
}
// show edit profile to yourself
- if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) {
- $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
- $r = q(
- "SELECT * FROM `profile` WHERE `uid` = %d",
- local_user()
- );
+ if (!$is_contact && $local_user_is_self) {
+ if (Feature::isEnabled(local_user(), 'multi_profiles')) {
+ $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
+ $r = q(
+ "SELECT * FROM `profile` WHERE `uid` = %d",
+ local_user()
+ );
- $profile['menu'] = [
- 'chg_photo' => L10n::t('Change profile photo'),
- 'cr_new' => L10n::t('Create New Profile'),
- 'entries' => [],
- ];
+ $profile['menu'] = [
+ 'chg_photo' => L10n::t('Change profile photo'),
+ 'cr_new' => L10n::t('Create New Profile'),
+ 'entries' => [],
+ ];
- if (DBA::isResult($r)) {
- foreach ($r as $rr) {
- $profile['menu']['entries'][] = [
- 'photo' => $rr['thumb'],
- 'id' => $rr['id'],
- 'alt' => L10n::t('Profile Image'),
- 'profile_name' => $rr['profile-name'],
- 'isdefault' => $rr['is-default'],
- 'visibile_to_everybody' => L10n::t('visible to everybody'),
- 'edit_visibility' => L10n::t('Edit visibility'),
- ];
+ if (DBA::isResult($r)) {
+ foreach ($r as $rr) {
+ $profile['menu']['entries'][] = [
+ 'photo' => $rr['thumb'],
+ 'id' => $rr['id'],
+ 'alt' => L10n::t('Profile Image'),
+ 'profile_name' => $rr['profile-name'],
+ 'isdefault' => $rr['is-default'],
+ 'visibile_to_everybody' => L10n::t('visible to everybody'),
+ '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);
$o .= Renderer::replaceMacros($tpl, [
'$profile' => $p,
'$xmpp' => $xmpp,
- '$connect' => $connect,
- '$remoteconnect' => $remoteconnect,
- '$subscribe_feed' => $subscribe_feed,
- '$wallmessage' => $wallmessage,
+ '$follow' => L10n::t('Follow'),
+ '$follow_link' => $follow_link,
+ '$unfollow' => L10n::t('Unfollow'),
+ '$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,
*/
public static function getMyURL()
{
- if (!empty($_SESSION['my_url'])) {
- return $_SESSION['my_url'];
- }
- return null;
+ return Session::get('my_url');
}
/**
$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'],
'$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 = '';
$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);
'$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')),
$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);
}
{{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 *}}
{{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 $remoteconnect}}
- <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 $unfollow_link}}
+ <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+ {{/if}}
+ {{if $follow_link}}
+ <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
- {{if $wallmessage}}
+ {{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
- {{if $subscribe_feed}}
- <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+ {{if $subscribe_feed_link}}
+ <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>
{{/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>
{{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 $remoteconnect}}
- <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 $unfollow_link}}
+ <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/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}}
- <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+ {{if $subscribe_feed_link}}
+ <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>
{{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>
{{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}}
- <a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
- <span class=""><i class="fa fa-user-plus"></i></span>
- <span class="">{{$connect}}</span>
+ {{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>
{{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>
</div>
{{/if}}
</div>
+ {{/if}}
<div class="clear"></div>
{{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>
{{/if}}
{{include file="diaspora_vcard.tpl"}}
-
+
<div id="profile-extra-links">
<ul>
- {{if $connect}}
- {{if $remoteconnect}}
- <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 $unfollow_link}}
+ <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+ {{/if}}
+ {{if $follow_link}}
+ <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
- {{if $wallmessage}}
+ {{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
- {{if $subscribe_feed}}
- <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+ {{if $subscribe_feed_link}}
+ <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>
{{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 *}}
{{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 $remoteconnect}}
- <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 $unfollow_link}}
+ <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+ {{/if}}
+ {{if $follow_link}}
+ <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
- {{if $wallmessage}}
+ {{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
- {{if $subscribe_feed}}
- <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+ {{if $subscribe_feed_link}}
+ <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>