use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
-use Friendica\Module\Login;
-use Friendica\Network\Probe;
+use Friendica\Module\Security\Login;
+use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
*/
class Contact extends BaseModule
{
- public static function init()
- {
- $a = self::getApp();
-
- if (!local_user()) {
- return;
- }
-
- $nets = defaults($_GET, 'nets', '');
- if ($nets == 'all') {
- $nets = '';
- }
-
- if (!x($a->page, 'aside')) {
- $a->page['aside'] = '';
- }
-
- $contact_id = null;
- $contact = null;
- 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()]);
-
- if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
- }
-
- // Don't display contacts that are about to be deleted
- if ($contact['network'] == Protocol::PHANTOM) {
- $contact = false;
- }
- }
-
- if (DBA::isResult($contact)) {
- if ($contact['self']) {
- if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
- $a->internalRedirect('profile/' . $contact['nick']);
- } else {
- $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
- }
- }
-
- $a->data['contact'] = $contact;
-
- if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
- $networkname = Strings::formatNetworkName($contact['network'], $contact['url']);
- } else {
- $networkname = '';
- }
-
- /// @TODO Add nice spaces
- $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
- '$name' => htmlentities($contact['name']),
- '$photo' => $contact['photo'],
- '$url' => Model\Contact::MagicLink($contact['url']),
- '$addr' => defaults($contact, 'addr', ''),
- '$network_name' => $networkname,
- '$network' => L10n::t('Network:'),
- '$account_type' => Model\Contact::getAccountType($contact)
- ]);
-
- $findpeople_widget = '';
- $follow_widget = '';
- $networks_widget = '';
- } else {
- $vcard_widget = '';
- $networks_widget = Widget::networks('contact', $nets);
- if (isset($_GET['add'])) {
- $follow_widget = Widget::follow($_GET['add']);
- } else {
- $follow_widget = Widget::follow();
- }
-
- $findpeople_widget = Widget::findPeople();
- }
-
- if ($contact['uid'] != 0) {
- $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
- } else {
- $groups_widget = null;
- }
-
- $a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [
- '$vcard_widget' => $vcard_widget,
- '$findpeople_widget' => $findpeople_widget,
- '$follow_widget' => $follow_widget,
- '$groups_widget' => $groups_widget,
- '$networks_widget' => $networks_widget
- ]);
-
- $base = $a->getBaseURL();
- $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
- '$baseurl' => System::baseUrl(true),
- '$base' => $base
- ]);
- }
-
- private static function batchActions(App $a)
+ private static function batchActions()
{
if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
return;
$contacts_id = $_POST['contact_batch'];
- $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
+ $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false, 'deleted' => false]);
$orig_records = DBA::toArray($stmt);
$count_actions = 0;
info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
}
- $a->internalRedirect('contact');
+ DI::baseUrl()->redirect('contact');
}
- public static function post()
+ public static function post(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (!local_user()) {
return;
}
+ // @TODO: Replace with parameter from router
if ($a->argv[1] === 'batch') {
- self::batchActions($a);
+ self::batchActions();
return;
}
+ // @TODO: Replace with parameter from router
$contact_id = intval($a->argv[1]);
if (!$contact_id) {
return;
}
- if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
+ if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
notice(L10n::t('Could not access contact record.') . EOL);
- $a->internalRedirect('contact');
+ DI::baseUrl()->redirect('contact');
return; // NOTREACHED
}
- Addon::callHooks('contact_edit_post', $_POST);
+ Hook::callAll('contact_edit_post', $_POST);
- $profile_id = intval(defaults($_POST, 'profile-assign', 0));
+ $profile_id = intval($_POST['profile-assign'] ?? 0);
if ($profile_id) {
if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
notice(L10n::t('Could not locate selected profile.') . EOL);
$notify = !empty($_POST['notify']);
- $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
+ $fetch_further_information = intval($_POST['fetch_further_information'] ?? 0);
- $ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+ $ffi_keyword_blacklist = Strings::escapeHtml(trim($_POST['ffi_keyword_blacklist'] ?? ''));
- $priority = intval(defaults($_POST, 'poll', 0));
+ $priority = intval($_POST['poll'] ?? 0);
if ($priority > 5 || $priority < 0) {
$priority = 0;
}
- $info = Strings::escapeHtml(trim(defaults($_POST, 'info', '')));
+ $info = Strings::escapeHtml(trim($_POST['info'] ?? ''));
$r = DBA::update('contact', [
'profile-id' => $profile_id,
notice(L10n::t('Failed to update contact record.') . EOL);
}
- $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
if (DBA::isResult($contact)) {
$a->data['contact'] = $contact;
}
private static function updateContactFromPoll($contact_id)
{
- $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+ $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
if (!DBA::isResult($contact)) {
return;
}
private static function updateContactFromProbe($contact_id)
{
- $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
if (!DBA::isResult($contact)) {
return;
}
- $uid = $contact['uid'];
-
- $data = Probe::uri($contact['url'], '', 0, false);
-
- // 'Feed' or 'Unknown' is mostly a sign of communication problems
- if ((in_array($data['network'], [Protocol::FEED, Protocol::PHANTOM])) && ($data['network'] != $contact['network'])) {
- return;
- }
-
- $updatefields = ['name', 'nick', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'network', 'alias'];
- $fields = [];
-
- if ($data['network'] == Protocol::OSTATUS) {
- $result = Model\Contact::createFromProbe($uid, $data['url'], false);
-
- if ($result['success']) {
- $fields['subhub'] = true;
- }
- }
-
- foreach ($updatefields AS $field) {
- if (!empty($data[$field])) {
- $fields[$field] = $data[$field];
- }
- }
-
- $fields['nurl'] = Strings::normaliseLink($data['url']);
-
- if (!empty($data['priority'])) {
- $fields['priority'] = intval($data['priority']);
- }
-
- if (empty($fields)) {
- return;
- }
-
- $r = DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
-
// Update the entry in the contact table
- Model\Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
+ Model\Contact::updateFromProbe($contact_id, '', true);
// Update the entry in the gcontact table
- Model\GContact::updateFromProbe($data['url']);
+ Model\GContact::updateFromProbe($contact['url']);
}
+ /**
+ * Toggles the blocked status of a contact identified by id.
+ *
+ * @param $contact_id
+ * @throws \Exception
+ */
private static function blockContact($contact_id)
{
$blocked = !Model\Contact::isBlockedByUser($contact_id, local_user());
Model\Contact::setBlockedForUser($contact_id, local_user(), $blocked);
}
+ /**
+ * Toggles the ignored status of a contact identified by id.
+ *
+ * @param $contact_id
+ * @throws \Exception
+ */
private static function ignoreContact($contact_id)
{
$ignored = !Model\Contact::isIgnoredByUser($contact_id, local_user());
Model\Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
}
+ /**
+ * Toggles the archived status of a contact identified by id.
+ * If the current status isn't provided, this will always archive the contact.
+ *
+ * @param $contact_id
+ * @param $orig_record
+ * @return bool
+ * @throws \Exception
+ */
private static function archiveContact($contact_id, $orig_record)
{
- $archived = (defaults($orig_record, 'archive', '') ? 0 : 1);
+ $archived = empty($orig_record['archive']);
$r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]);
return DBA::isResult($r);
Model\Contact::remove($orig_record['id']);
}
- public static function content($update = 0)
+ public static function content(array $parameters = [], $update = 0)
{
- $a = self::getApp();
+ if (!local_user()) {
+ return Login::form($_SERVER['REQUEST_URI']);
+ }
+
+ $a = DI::app();
+
+ $nets = $_GET['nets'] ?? '';
+ $rel = $_GET['rel'] ?? '';
+
+ if (empty($a->page['aside'])) {
+ $a->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]);
+ }
+
+ // Don't display contacts that are about to be deleted
+ if ($contact['network'] == Protocol::PHANTOM) {
+ $contact = false;
+ }
+ }
+
+ if (DBA::isResult($contact)) {
+ if ($contact['self']) {
+ // @TODO: Replace with parameter from router
+ 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');
+ }
+ }
+
+ $a->data['contact'] = $contact;
+
+ if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
+ $network_link = Strings::formatNetworkName($contact['network'], $contact['url']);
+ } else {
+ $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'],
+ '$url' => Model\Contact::magicLinkByContact($contact, $contact['url']),
+ '$addr' => $contact['addr'] ?? '',
+ '$network_link' => $network_link,
+ '$network' => L10n::t('Network:'),
+ '$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 = '';
+ $follow_widget = '';
+ $networks_widget = '';
+ $rel_widget = '';
+ } else {
+ $vcard_widget = '';
+ $findpeople_widget = Widget::findPeople();
+ if (isset($_GET['add'])) {
+ $follow_widget = Widget::follow($_GET['add']);
+ } else {
+ $follow_widget = Widget::follow();
+ }
+
+ $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;
+ }
+
+ $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+
+ $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ '$baseurl' => DI::baseUrl()->get(true),
+ ]);
+
$sort_type = 0;
$o = '';
Nav::setSelected('contact');
if ($a->argc == 3) {
$contact_id = intval($a->argv[1]);
if (!$contact_id) {
- return;
+ throw new BadRequestException();
}
+ // @TODO: Replace with parameter from router
$cmd = $a->argv[2];
- $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
+ $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
if (!DBA::isResult($orig_record)) {
- notice(L10n::t('Could not access contact record.') . EOL);
- $a->internalRedirect('contact');
- return; // NOTREACHED
+ throw new NotFoundException(L10n::t('Contact not found'));
}
if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
self::updateContactFromPoll($contact_id);
- $a->internalRedirect('contact/' . $contact_id);
+ DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
}
if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
self::updateContactFromProbe($contact_id);
- $a->internalRedirect('crepair/' . $contact_id);
+ DI::baseUrl()->redirect('crepair/' . $contact_id);
// NOTREACHED
}
$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
- $a->internalRedirect('contact/' . $contact_id);
- return; // NOTREACHED
+ DI::baseUrl()->redirect('contact/' . $contact_id);
+ // NOTREACHED
}
if ($cmd === 'ignore') {
$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
- $a->internalRedirect('contact/' . $contact_id);
- return; // NOTREACHED
+ DI::baseUrl()->redirect('contact/' . $contact_id);
+ // NOTREACHED
}
if ($cmd === 'archive' && ($orig_record['uid'] != 0)) {
info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
}
- $a->internalRedirect('contact/' . $contact_id);
- return; // NOTREACHED
+ DI::baseUrl()->redirect('contact/' . $contact_id);
+ // NOTREACHED
}
if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
if (!empty($_REQUEST['confirm'])) {
// <form> can't take arguments in its 'action' parameter
// so add any arguments as hidden inputs
- $query = explode_querystring($a->query_string);
+ $query = explode_querystring(DI::args()->getQueryString());
$inputs = [];
foreach ($query['args'] as $arg) {
if (strpos($arg, 'confirm=') === false) {
}
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
- $a->internalRedirect('contact');
+ DI::baseUrl()->redirect('contact');
}
self::dropContact($orig_record);
info(L10n::t('Contact has been removed.') . EOL);
- $a->internalRedirect('contact');
- return; // NOTREACHED
+ DI::baseUrl()->redirect('contact');
+ // NOTREACHED
}
if ($cmd === 'posts') {
return self::getPostsHTML($a, $contact_id);
}
}
- $_SESSION['return_path'] = $a->query_string;
+ $_SESSION['return_path'] = DI::args()->getQueryString();
if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
- $contact_id = $a->data['contact']['id'];
$contact = $a->data['contact'];
$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
- '$baseurl' => $a->getBaseURL(true),
+ '$baseurl' => DI::baseUrl()->get(true),
]);
$contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
$relation_text = '';
}
- if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+ if (!in_array($contact['network'], Protocol::FEDERATED)) {
$relation_text = '';
}
- $relation_text = sprintf($relation_text, htmlentities($contact['name']));
+ $relation_text = sprintf($relation_text, $contact['name']);
$url = Model\Contact::magicLink($contact['url']);
if (strpos($url, 'redir/') === 0) {
$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
- $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url']));
+ $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
// tabs
$tab_str = self::getTabsHTML($a, $contact, 3);
$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 (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');
- }
- } else {
- $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')),
'$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($contact['hidden'] == 1), L10n::t('Replies/likes to your public posts <strong>may</strong> still be visible')],
'$notify' => ['notify', L10n::t('Notification for new posts'), ($contact['notify_new_posts'] == 1), L10n::t('Send a notification of every new post of this contact')],
'$fetch_further_information' => $fetch_further_information,
- '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
'$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', L10n::t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], L10n::t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
'$photo' => $contact['photo'],
- '$name' => htmlentities($contact['name']),
+ '$name' => $contact['name'],
'$dir_icon' => $dir_icon,
'$sparkle' => $sparkle,
'$url' => $url,
$arr = ['contact' => $contact, 'output' => $o];
- Addon::callHooks('contact_edit', $arr);
+ Hook::callAll('contact_edit', $arr);
return $arr['output'];
}
- $blocked = false;
- $hidden = false;
- $ignored = false;
- $archived = false;
- $all = false;
-
- if (($a->argc == 2) && ($a->argv[1] === 'all')) {
- $sql_extra = '';
- $all = true;
- } elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) {
- $sql_extra = " AND `blocked` = 1 ";
- $blocked = true;
- } elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) {
- $sql_extra = " AND `hidden` = 1 ";
- $hidden = true;
- } elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) {
- $sql_extra = " AND `readonly` = 1 ";
- $ignored = true;
- } elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) {
- $sql_extra = " AND `archive` = 1 ";
- $archived = true;
- } else {
- $sql_extra = " AND `blocked` = 0 ";
+ $select_uid = 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;
+ 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;
+ 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);
+ break;
+ default:
+ $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
}
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
- $search = Strings::escapeTags(trim(defaults($_GET, 'search', '')));
- $nets = Strings::escapeTags(trim(defaults($_GET, 'nets' , '')));
+ $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
+ $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
+ $rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
$tabs = [
- [
- 'label' => L10n::t('Suggestions'),
- 'url' => 'suggest',
- 'sel' => '',
- 'title' => L10n::t('Suggest potential friends'),
- 'id' => 'suggestions-tab',
- 'accesskey' => 'g',
- ],
[
'label' => L10n::t('All Contacts'),
- 'url' => 'contact/all',
- 'sel' => ($all) ? 'active' : '',
+ 'url' => 'contact',
+ 'sel' => !$type ? 'active' : '',
'title' => L10n::t('Show all contacts'),
'id' => 'showall-tab',
'accesskey' => 'l',
],
[
- 'label' => L10n::t('Unblocked'),
- 'url' => 'contact',
- 'sel' => ((!$all) && (!$blocked) && (!$hidden) && (!$search) && (!$nets) && (!$ignored) && (!$archived)) ? 'active' : '',
- 'title' => L10n::t('Only show unblocked contacts'),
- 'id' => 'showunblocked-tab',
- 'accesskey' => 'o',
+ 'label' => L10n::t('Pending'),
+ 'url' => 'contact/pending',
+ 'sel' => $type == 'pending' ? 'active' : '',
+ 'title' => L10n::t('Only show pending contacts'),
+ 'id' => 'showpending-tab',
+ 'accesskey' => 'p',
],
[
'label' => L10n::t('Blocked'),
'url' => 'contact/blocked',
- 'sel' => ($blocked) ? 'active' : '',
+ 'sel' => $type == 'blocked' ? 'active' : '',
'title' => L10n::t('Only show blocked contacts'),
'id' => 'showblocked-tab',
'accesskey' => 'b',
[
'label' => L10n::t('Ignored'),
'url' => 'contact/ignored',
- 'sel' => ($ignored) ? 'active' : '',
+ 'sel' => $type == 'ignored' ? 'active' : '',
'title' => L10n::t('Only show ignored contacts'),
'id' => 'showignored-tab',
'accesskey' => 'i',
[
'label' => L10n::t('Archived'),
'url' => 'contact/archived',
- 'sel' => ($archived) ? 'active' : '',
+ 'sel' => $type == 'archived' ? 'active' : '',
'title' => L10n::t('Only show archived contacts'),
'id' => 'showarchived-tab',
'accesskey' => 'y',
[
'label' => L10n::t('Hidden'),
'url' => 'contact/hidden',
- 'sel' => ($hidden) ? 'active' : '',
+ 'sel' => $type == 'hidden' ? 'active' : '',
'title' => L10n::t('Only show hidden contacts'),
'id' => 'showhidden-tab',
'accesskey' => 'h',
],
+ [
+ 'label' => L10n::t('Groups'),
+ 'url' => 'group',
+ 'sel' => '',
+ 'title' => L10n::t('Organize your contact groups'),
+ 'id' => 'contactgroups-tab',
+ 'accesskey' => 'e',
+ ],
];
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
$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 AND `pending` = 0 $sql_extra $sql_extra2 ",
- intval($_SESSION['uid'])
+ 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($a->query_string);
-
- $sql_extra3 = Widget::unavailableNetworks();
+ $pager = new Pager(DI::args()->getQueryString());
$contacts = [];
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
- intval($_SESSION['uid']),
+ $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()
);
}
}
+ switch ($rel) {
+ case 'followers': $header = L10n::t('Followers'); break;
+ case 'following': $header = L10n::t('Following'); break;
+ case 'mutuals': $header = L10n::t('Mutual friends'); break;
+ default: $header = L10n::t('Contacts');
+ }
+
+ switch ($type) {
+ case 'pending': $header .= ' - ' . L10n::t('Pending'); break;
+ case 'blocked': $header .= ' - ' . L10n::t('Blocked'); break;
+ case 'hidden': $header .= ' - ' . L10n::t('Hidden'); break;
+ case 'ignored': $header .= ' - ' . L10n::t('Ignored'); break;
+ case 'archived': $header .= ' - ' . L10n::t('Archived'); break;
+ }
+
+ $header .= $nets ? ' - ' . ContactSelector::networkToName($nets) : '';
+
$tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
$o .= Renderer::replaceMacros($tpl, [
- '$baseurl' => System::baseUrl(),
- '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
+ '$header' => $header,
'$tabs' => $t,
'$total' => $total,
'$search' => $search_hdr,
'$desc' => L10n::t('Search your contacts'),
'$finding' => $searching ? L10n::t('Results for: %s', $search) : '',
'$submit' => L10n::t('Find'),
- '$cmd' => $a->cmd,
+ '$cmd' => DI::args()->getCommand(),
'$contacts' => $contacts,
'$contact_drop_confirm' => L10n::t('Do you really want to delete this contact?'),
'multiselect' => 1,
*
* 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
+ * @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.
-
+ * @return string HTML string of the contact page tabs buttons.
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function getTabsHTML($a, $contact, $active_tab)
{
'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'],
'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
- 'acl' => ACL::getFullSelectorHTML($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
}
}
- $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+ $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
if (!$update) {
$o .= self::getTabsHTML($a, $contact, 1);
$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);
}
private static function getPostsHTML($a, $contact_id)
{
- $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+ $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
$o = self::getTabsHTML($a, $contact, 2);
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
- if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
$profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
}
$dir_icon = '';
$alt_text = '';
- switch ($rr['rel']) {
- case Model\Contact::FRIEND:
- $dir_icon = 'images/lrarrow.gif';
- $alt_text = L10n::t('Mutual Friendship');
- break;
+ if (!empty($rr['uid']) && !empty($rr['rel'])) {
+ switch ($rr['rel']) {
+ case Model\Contact::FRIEND:
+ $dir_icon = 'images/lrarrow.gif';
+ $alt_text = L10n::t('Mutual Friendship');
+ break;
- case Model\Contact::FOLLOWER;
- $dir_icon = 'images/larrow.gif';
- $alt_text = L10n::t('is a fan of yours');
- break;
+ case Model\Contact::FOLLOWER;
+ $dir_icon = 'images/larrow.gif';
+ $alt_text = L10n::t('is a fan of yours');
+ break;
- case Model\Contact::SHARING;
- $dir_icon = 'images/rarrow.gif';
- $alt_text = L10n::t('you are a fan of');
- break;
+ case Model\Contact::SHARING;
+ $dir_icon = 'images/rarrow.gif';
+ $alt_text = L10n::t('you are a fan of');
+ break;
- default:
- break;
+ default:
+ break;
+ }
}
$url = Model\Contact::magicLink($rr['url']);
$sparkle = '';
}
+ if ($rr['pending']) {
+ if (in_array($rr['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+ $alt_text = L10n::t('Pending outgoing contact request');
+ } else {
+ $alt_text = L10n::t('Pending incoming contact request');
+ }
+ }
+
if ($rr['self']) {
$dir_icon = 'images/larrow.gif';
$alt_text = L10n::t('This is you');
'alt_text' => $alt_text,
'dir_icon' => $dir_icon,
'thumb' => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB),
- 'name' => htmlentities($rr['name']),
- 'username' => htmlentities($rr['name']),
+ 'name' => $rr['name'],
+ 'username' => $rr['name'],
'account_type' => Model\Contact::getAccountType($rr),
'sparkle' => $sparkle,
- 'itemurl' => defaults($rr, 'addr', $rr['url']),
+ 'itemurl' => ($rr['addr'] ?? '') ?: $rr['url'],
'url' => $url,
- 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
- 'nick' => htmlentities($rr['nick']),
+ 'network' => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
+ 'nick' => $rr['nick'],
];
}