<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
namespace Friendica\Module;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
/**
}
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
- notice(DI::l10n()->t('Could not access contact record.') . EOL);
+ notice(DI::l10n()->t('Could not access contact record.'));
DI::baseUrl()->redirect('contact');
return; // NOTREACHED
}
$fetch_further_information = intval($_POST['fetch_further_information'] ?? 0);
- $ffi_keyword_blacklist = Strings::escapeHtml(trim($_POST['ffi_keyword_blacklist'] ?? ''));
+ $ffi_keyword_denylist = Strings::escapeHtml(trim($_POST['ffi_keyword_denylist'] ?? ''));
$priority = intval($_POST['poll'] ?? 0);
if ($priority > 5 || $priority < 0) {
'hidden' => $hidden,
'notify_new_posts' => $notify,
'fetch_further_information' => $fetch_further_information,
- 'ffi_keyword_blacklist' => $ffi_keyword_blacklist],
+ 'ffi_keyword_denylist' => $ffi_keyword_denylist],
['id' => $contact_id, 'uid' => local_user()]
);
- if (DBA::isResult($r)) {
- info(DI::l10n()->t('Contact updated.') . EOL);
- } else {
- notice(DI::l10n()->t('Failed to update contact record.') . EOL);
+ if (!DBA::isResult($r)) {
+ notice(DI::l10n()->t('Failed to update contact record.'));
}
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
return;
}
- $uid = $contact['uid'];
-
if ($contact['network'] == Protocol::OSTATUS) {
- $result = Model\Contact::createFromProbe($uid, $contact['url'], false, $contact['network']);
+ $user = Model\User::getById($contact['uid']);
+ $result = Model\Contact::createFromProbe($user, $contact['url'], false, $contact['network']);
if ($result['success']) {
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
private static function updateContactFromProbe($contact_id)
{
- $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => [0, local_user()], 'deleted' => false]);
if (!DBA::isResult($contact)) {
return;
}
// Update the entry in the contact table
Model\Contact::updateFromProbe($contact_id, '', true);
-
- // Update the entry in the gcontact table
- Model\GContact::updateFromProbe($contact['url']);
}
/**
*/
private static function blockContact($contact_id)
{
- $blocked = !Model\Contact::isBlockedByUser($contact_id, local_user());
- Model\Contact::setBlockedForUser($contact_id, local_user(), $blocked);
+ $blocked = !Model\Contact\User::isBlocked($contact_id, local_user());
+ Model\Contact\User::setBlocked($contact_id, local_user(), $blocked);
}
/**
*/
private static function ignoreContact($contact_id)
{
- $ignored = !Model\Contact::isIgnoredByUser($contact_id, local_user());
- Model\Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
+ $ignored = !Model\Contact\User::isIgnored($contact_id, local_user());
+ Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
}
/**
$a = DI::app();
- $nets = $_GET['nets'] ?? '';
- $rel = $_GET['rel'] ?? '';
+ $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
+ $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
+ $rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
+ $group = Strings::escapeTags(trim($_GET['group'] ?? ''));
if (empty(DI::page()['aside'])) {
DI::page()['aside'] = '';
}
- $contact_id = null;
$contact = null;
// @TODO: Replace with parameter from router
if ($a->argc == 2 && intval($a->argv[1])
|| $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])
) {
$contact_id = intval($a->argv[1]);
- $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
- if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]);
+ // Ensure to use the user contact when the public contact was provided
+ $data = Model\Contact::getPublicAndUserContacID($contact_id, local_user());
+ if (!empty($data['user']) && ($contact_id == $data['public'])) {
+ $contact_id = $data['user'];
}
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'deleted' => false]);
+
// Don't display contacts that are about to be deleted
if ($contact['network'] == Protocol::PHANTOM) {
$contact = false;
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
DI::baseUrl()->redirect('profile/' . $contact['nick']);
} else {
- DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
+ DI::baseUrl()->redirect('profile/' . $contact['nick'] . '/profile');
}
}
$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
'$name' => $contact['name'],
- '$photo' => $contact['photo'],
+ '$photo' => Model\Contact::getPhoto($contact),
'$url' => Model\Contact::magicLinkByContact($contact, $contact['url']),
'$addr' => $contact['addr'] ?? '',
'$network_link' => $network_link,
$follow_widget = '';
$networks_widget = '';
$rel_widget = '';
+
+ if ($contact['uid'] != 0) {
+ $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
+ } else {
+ $groups_widget = '';
+ }
} else {
$vcard_widget = '';
$findpeople_widget = Widget::findPeople();
$networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
$rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
- }
-
- if ($contact['uid'] != 0) {
- $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
- } else {
- $groups_widget = null;
+ $groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group);
}
DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
'$baseurl' => DI::baseUrl()->get(true),
]);
- $sort_type = 0;
$o = '';
Nav::setSelected('contact');
if (!local_user()) {
- notice(DI::l10n()->t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.'));
return Login::form();
}
// NOTREACHED
}
- if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
+ if ($cmd === 'updateprofile') {
self::updateContactFromProbe($contact_id);
- DI::baseUrl()->redirect('crepair/' . $contact_id);
+ DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
}
if ($cmd === 'block') {
self::blockContact($contact_id);
- $blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
- info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')) . EOL);
+ $blocked = Model\Contact\User::isBlocked($contact_id, local_user());
+ info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')));
DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
if ($cmd === 'ignore') {
self::ignoreContact($contact_id);
- $ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
- info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')) . EOL);
+ $ignored = Model\Contact\User::isIgnored($contact_id, local_user());
+ info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')));
DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
$r = self::archiveContact($contact_id, $orig_record);
if ($r) {
$archived = (($orig_record['archive']) ? 0 : 1);
- info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')) . EOL);
+ info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')));
}
DI::baseUrl()->redirect('contact/' . $contact_id);
}
self::dropContact($orig_record);
- info(DI::l10n()->t('Contact has been removed.') . EOL);
+ info(DI::l10n()->t('Contact has been removed.'));
DI::baseUrl()->redirect('contact');
// NOTREACHED
'$baseurl' => DI::baseUrl()->get(true),
]);
- $contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
- $contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
+ $contact['blocked'] = Model\Contact\User::isBlocked($contact['id'], local_user());
+ $contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], local_user());
- $dir_icon = '';
$relation_text = '';
switch ($contact['rel']) {
case Model\Contact::FRIEND:
- $dir_icon = 'images/lrarrow.gif';
$relation_text = DI::l10n()->t('You are mutual friends with %s');
break;
case Model\Contact::FOLLOWER;
- $dir_icon = 'images/larrow.gif';
$relation_text = DI::l10n()->t('You are sharing with %s');
break;
case Model\Contact::SHARING;
- $dir_icon = 'images/rarrow.gif';
$relation_text = DI::l10n()->t('%s is sharing with you');
break;
$relation_text = '';
}
- if (!in_array($contact['network'], Protocol::FEDERATED)) {
+ if (!in_array($contact['network'], array_merge(Protocol::FEDERATED, [Protocol::TWITTER]))) {
$relation_text = '';
}
$nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
// tabs
- $tab_str = self::getTabsHTML($a, $contact, 3);
+ $tab_str = self::getTabsHTML($contact, 3);
$lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : '');
'$visit' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
'$blockunblock' => DI::l10n()->t('Block/Unblock contact'),
'$ignorecont' => DI::l10n()->t('Ignore contact'),
- '$lblcrepair' => DI::l10n()->t('Repair URL settings'),
'$lblrecent' => DI::l10n()->t('View conversations'),
'$lblsuggest' => $lblsuggest,
'$nettype' => $nettype,
'$hidden' => ['hidden', DI::l10n()->t('Hide this contact from others'), ($contact['hidden'] == 1), DI::l10n()->t('Replies/likes to your public posts <strong>may</strong> still be visible')],
'$notify' => ['notify', DI::l10n()->t('Notification for new posts'), ($contact['notify_new_posts'] == 1), DI::l10n()->t('Send a notification of every new post of this contact')],
'$fetch_further_information' => $fetch_further_information,
- '$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', DI::l10n()->t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], DI::l10n()->t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
- '$photo' => $contact['photo'],
+ '$ffi_keyword_denylist' => ['ffi_keyword_denylist', DI::l10n()->t('Keyword Deny List'), $contact['ffi_keyword_denylist'], DI::l10n()->t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
+ '$photo' => Model\Contact::getPhoto($contact),
'$name' => $contact['name'],
- '$dir_icon' => $dir_icon,
'$sparkle' => $sparkle,
'$url' => $url,
'$profileurllabel'=> DI::l10n()->t('Profile URL'),
return $arr['output'];
}
- $select_uid = local_user();
+ $sql_values = [local_user()];
// @TODO: Replace with parameter from router
$type = $a->argv[1] ?? '';
switch ($type) {
case 'blocked':
- $sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`blocked`)", intval(local_user()));
- $select_uid = 0;
+ $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`blocked`)";
+ // This makes the query look for contact.uid = 0
+ array_unshift($sql_values, 0);
break;
case 'hidden':
$sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
break;
case 'ignored':
- $sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`ignored`)", intval(local_user()));
- $select_uid = 0;
+ $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`ignored`)";
+ // This makes the query look for contact.uid = 0
+ array_unshift($sql_values, 0);
break;
case 'archived':
$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
break;
case 'pending':
- $sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d)
- OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))", Model\Contact::SHARING);
+ $sql_extra = " AND `pending` AND NOT `archive` AND ((`rel` = ?)
+ OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))";
+ $sql_values[] = Model\Contact::SHARING;
break;
default:
$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
+ break;
}
- $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
+ $searching = false;
+ $search_hdr = null;
+ if ($search) {
+ $searching = true;
+ $search_hdr = $search;
+ $search_txt = preg_quote($search);
+ $sql_extra .= " AND (name REGEXP ? OR url REGEXP ? OR nick REGEXP ?)";
+ $sql_values[] = $search_txt;
+ $sql_values[] = $search_txt;
+ $sql_values[] = $search_txt;
+ }
- $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
- $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
- $rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
+ if ($nets) {
+ $sql_extra .= " AND network = ? ";
+ $sql_values[] = $nets;
+ }
+
+ switch ($rel) {
+ case 'followers':
+ $sql_extra .= " AND `rel` IN (?, ?)";
+ $sql_values[] = Model\Contact::FOLLOWER;
+ $sql_values[] = Model\Contact::FRIEND;
+ break;
+ case 'following':
+ $sql_extra .= " AND `rel` IN (?, ?)";
+ $sql_values[] = Model\Contact::SHARING;
+ $sql_values[] = Model\Contact::FRIEND;
+ break;
+ case 'mutuals':
+ $sql_extra .= " AND `rel` = ?";
+ $sql_values[] = Model\Contact::FRIEND;
+ break;
+ }
+
+ if ($group) {
+ $sql_extra = " AND EXISTS(SELECT `id` FROM `group_member` WHERE `gid` = ? AND `contact`.`id` = `contact-id`)";
+ $sql_values[] = $group;
+ }
+
+ $total = 0;
+ $stmt = DBA::p("SELECT COUNT(*) AS `total`
+ FROM `contact`
+ WHERE `uid` = ?
+ AND `self` = 0
+ AND NOT `deleted`
+ $sql_extra
+ " . Widget::unavailableNetworks(),
+ $sql_values
+ );
+ if (DBA::isResult($stmt)) {
+ $total = DBA::fetch($stmt)['total'];
+ }
+ DBA::close($stmt);
+
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
+
+ $sql_values[] = $pager->getStart();
+ $sql_values[] = $pager->getItemsPerPage();
+
+ $contacts = [];
+
+ $stmt = DBA::p("SELECT *
+ FROM `contact`
+ WHERE `uid` = ?
+ AND `self` = 0
+ AND NOT `deleted`
+ $sql_extra
+ ORDER BY `name` ASC
+ LIMIT ?, ?",
+ $sql_values
+ );
+ while ($contact = DBA::fetch($stmt)) {
+ $contact['blocked'] = Model\Contact\User::isBlocked($contact['id'], local_user());
+ $contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], local_user());
+ $contacts[] = self::getContactTemplateVars($contact);
+ }
+ DBA::close($stmt);
$tabs = [
[
],
];
- $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
- $t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
-
- $total = 0;
- $searching = false;
- $search_hdr = null;
- if ($search) {
- $searching = true;
- $search_hdr = $search;
- $search_txt = DBA::escape(Strings::protectSprintf(preg_quote($search)));
- $sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt' OR nick REGEXP '$search_txt') ";
- }
-
- if ($nets) {
- $sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
- }
-
- switch ($rel) {
- case 'followers': $sql_extra .= " AND `rel` IN (1, 3)"; break;
- case 'following': $sql_extra .= " AND `rel` IN (2, 3)"; break;
- case 'mutuals': $sql_extra .= " AND `rel` = 3"; break;
- }
-
- $sql_extra .= " AND NOT `deleted` ";
-
- $sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
-
- $sql_extra3 = Widget::unavailableNetworks();
-
- $r = q("SELECT COUNT(*) AS `total` FROM `contact`
- WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3",
- intval($select_uid)
- );
- if (DBA::isResult($r)) {
- $total = $r[0]['total'];
- }
- $pager = new Pager(DI::args()->getQueryString());
-
- $contacts = [];
-
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
- intval($select_uid),
- $pager->getStart(),
- $pager->getItemsPerPage()
- );
- if (DBA::isResult($r)) {
- foreach ($r as $rr) {
- $rr['blocked'] = Model\Contact::isBlockedByUser($rr['id'], local_user());
- $rr['readonly'] = Model\Contact::isIgnoredByUser($rr['id'], local_user());
- $contacts[] = self::getContactTemplateVars($rr);
- }
- }
+ $tabs_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+ $tabs_html = Renderer::replaceMacros($tabs_tpl, ['$tabs' => $tabs]);
switch ($rel) {
case 'followers': $header = DI::l10n()->t('Followers'); break;
$tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
$o .= Renderer::replaceMacros($tpl, [
'$header' => $header,
- '$tabs' => $t,
+ '$tabs' => $tabs_html,
'$total' => $total,
'$search' => $search_hdr,
'$desc' => DI::l10n()->t('Search your contacts'),
*
* Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
*
- * @param App $a
* @param array $contact The contact array
* @param int $active_tab 1 if tab should be marked as active
*
* @return string HTML string of the contact page tabs buttons.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- public static function getTabsHTML($a, $contact, $active_tab)
+ public static function getTabsHTML(array $contact, int $active_tab)
{
+ $cid = $pcid = $contact['id'];
+ $data = Model\Contact::getPublicAndUserContacID($contact['id'], local_user());
+ if (!empty($data['user']) && ($contact['id'] == $data['public'])) {
+ $cid = $data['user'];
+ } elseif (!empty($data['public'])) {
+ $pcid = $data['public'];
+ }
+
// tabs
$tabs = [
[
'label' => DI::l10n()->t('Status'),
- 'url' => "contact/" . $contact['id'] . "/conversations",
+ 'url' => "contact/" . $pcid . "/conversations",
'sel' => (($active_tab == 1) ? 'active' : ''),
'title' => DI::l10n()->t('Conversations started by this contact'),
'id' => 'status-tab',
],
[
'label' => DI::l10n()->t('Posts and Comments'),
- 'url' => "contact/" . $contact['id'] . "/posts",
+ 'url' => "contact/" . $pcid . "/posts",
'sel' => (($active_tab == 2) ? 'active' : ''),
'title' => DI::l10n()->t('Status Messages and Posts'),
'id' => 'posts-tab',
],
[
'label' => DI::l10n()->t('Profile'),
- 'url' => "contact/" . $contact['id'],
+ 'url' => "contact/" . $cid,
'sel' => (($active_tab == 3) ? 'active' : ''),
'title' => DI::l10n()->t('Profile Details'),
'id' => 'profile-tab',
];
// Show this tab only if there is visible friend list
- $x = Model\GContact::countAllFriends(local_user(), $contact['id']);
+ $x = Model\Contact\Relation::countFollows($pcid);
if ($x) {
$tabs[] = ['label' => DI::l10n()->t('Contacts'),
- 'url' => "allfriends/" . $contact['id'],
+ 'url' => "allfriends/" . $pcid,
'sel' => (($active_tab == 4) ? 'active' : ''),
'title' => DI::l10n()->t('View all contacts'),
'id' => 'allfriends-tab',
}
// Show this tab only if there is visible common friend list
- $common = Model\GContact::countCommonFriends(local_user(), $contact['id']);
+ $common = Model\GContact::countCommonFriends(local_user(), $cid);
if ($common) {
$tabs[] = ['label' => DI::l10n()->t('Common Friends'),
- 'url' => "common/loc/" . local_user() . "/" . $contact['id'],
+ 'url' => "common/loc/" . local_user() . "/" . $cid,
'sel' => (($active_tab == 5) ? 'active' : ''),
'title' => DI::l10n()->t('View all common friends'),
'id' => 'common-loc-tab',
];
}
- if (!empty($contact['uid'])) {
+ if ($cid != $pcid) {
$tabs[] = ['label' => DI::l10n()->t('Advanced'),
- 'url' => 'crepair/' . $contact['id'],
+ 'url' => 'contact/' . $cid . '/advanced/',
'sel' => (($active_tab == 6) ? 'active' : ''),
'title' => DI::l10n()->t('Advanced Contact Settings'),
'id' => 'advanced-tab',
$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
if (!$update) {
- $o .= self::getTabsHTML($a, $contact, 1);
+ $o .= self::getTabsHTML($contact, 1);
}
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';
- $profiledata = Model\Contact::getDetailsByURL($contact['url']);
+ $profiledata = Model\Contact::getByURL($contact['url'], false);
+
+ Model\Profile::load($a, '', $profiledata, true);
- Model\Profile::load($a, '', 0, $profiledata, true);
- $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+ if ($contact['uid'] == 0) {
+ $o .= Model\Contact::getPostsFromId($contact['id'], true, $update);
+ } else {
+ $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
+ }
}
return $o;
{
$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
- $o = self::getTabsHTML($a, $contact, 2);
+ $o = self::getTabsHTML($contact, 2);
if (DBA::isResult($contact)) {
DI::page()['aside'] = '';
- $profiledata = Model\Contact::getDetailsByURL($contact['url']);
+ $profiledata = Model\Contact::getByURL($contact['url'], false);
if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
$profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
}
- Model\Profile::load($a, '', 0, $profiledata, true);
- $o .= Model\Contact::getPostsFromUrl($contact['url']);
+ Model\Profile::load($a, '', $profiledata, true);
+
+ if ($contact['uid'] == 0) {
+ $o .= Model\Contact::getPostsFromId($contact['id']);
+ } else {
+ $o .= Model\Contact::getPostsFromUrl($contact['url']);
+ }
}
return $o;
}
- public static function getContactTemplateVars(array $rr)
+ /**
+ * Return the fields for the contact template
+ *
+ * @param array $contact Contact array
+ * @return array Template fields
+ */
+ public static function getContactTemplateVars(array $contact)
{
- $dir_icon = '';
$alt_text = '';
- if (!empty($rr['uid']) && !empty($rr['rel'])) {
- switch ($rr['rel']) {
+ if (!empty($contact['url']) && isset($contact['uid']) && ($contact['uid'] == 0) && local_user()) {
+ $personal = Model\Contact::getByURL($contact['url'], false, ['uid', 'rel', 'self'], local_user());
+ if (!empty($personal)) {
+ $contact['uid'] = $personal['uid'];
+ $contact['rel'] = $personal['rel'];
+ $contact['self'] = $personal['self'];
+ }
+ }
+
+ if (!empty($contact['uid']) && !empty($contact['rel']) && local_user() == $contact['uid']) {
+ switch ($contact['rel']) {
case Model\Contact::FRIEND:
- $dir_icon = 'images/lrarrow.gif';
$alt_text = DI::l10n()->t('Mutual Friendship');
break;
case Model\Contact::FOLLOWER;
- $dir_icon = 'images/larrow.gif';
$alt_text = DI::l10n()->t('is a fan of yours');
break;
case Model\Contact::SHARING;
- $dir_icon = 'images/rarrow.gif';
$alt_text = DI::l10n()->t('you are a fan of');
break;
}
}
- $url = Model\Contact::magicLink($rr['url']);
+ $url = Model\Contact::magicLink($contact['url']);
if (strpos($url, 'redir/') === 0) {
$sparkle = ' class="sparkle" ';
$sparkle = '';
}
- if ($rr['pending']) {
- if (in_array($rr['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+ if ($contact['pending']) {
+ if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
$alt_text = DI::l10n()->t('Pending outgoing contact request');
} else {
$alt_text = DI::l10n()->t('Pending incoming contact request');
}
}
- if ($rr['self']) {
- $dir_icon = 'images/larrow.gif';
+ if ($contact['self']) {
$alt_text = DI::l10n()->t('This is you');
- $url = $rr['url'];
+ $url = $contact['url'];
$sparkle = '';
}
return [
- 'img_hover' => DI::l10n()->t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
- 'edit_hover'=> DI::l10n()->t('Edit contact'),
- 'photo_menu'=> Model\Contact::photoMenu($rr),
- 'id' => $rr['id'],
- 'alt_text' => $alt_text,
- 'dir_icon' => $dir_icon,
- 'thumb' => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB),
- 'name' => $rr['name'],
- 'username' => $rr['name'],
- 'account_type' => Model\Contact::getAccountType($rr),
- 'sparkle' => $sparkle,
- 'itemurl' => ($rr['addr'] ?? '') ?: $rr['url'],
- 'url' => $url,
- 'network' => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
- 'nick' => $rr['nick'],
+ 'id' => $contact['id'],
+ 'url' => $url,
+ 'img_hover' => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
+ 'photo_menu' => Model\Contact::photoMenu($contact),
+ 'thumb' => Model\Contact::getThumb($contact),
+ 'alt_text' => $alt_text,
+ 'name' => $contact['name'],
+ 'nick' => $contact['nick'],
+ 'details' => $contact['location'],
+ 'tags' => $contact['keywords'],
+ 'about' => $contact['about'],
+ 'account_type' => Model\Contact::getAccountType($contact),
+ 'sparkle' => $sparkle,
+ 'itemurl' => ($contact['addr'] ?? '') ?: $contact['url'],
+ 'network' => ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']),
];
}
];
}
+ if (in_array($contact['network'], Protocol::FEDERATED)) {
+ $contact_actions['updateprofile'] = [
+ 'label' => DI::l10n()->t('Refetch contact data'),
+ 'url' => 'contact/' . $contact['id'] . '/updateprofile',
+ 'title' => '',
+ 'sel' => '',
+ 'id' => 'updateprofile',
+ ];
+ }
+
$contact_actions['block'] = [
'label' => (intval($contact['blocked']) ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
'url' => 'contact/' . $contact['id'] . '/block',