use Friendica\Content\Widget;
use Friendica\Core\ACL;
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\Security\Login;
use Friendica\Network\HTTPException\BadRequestException;
use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
/**
* Manages and show Contacts and their content
- *
- * @brief manages contacts
*/
class Contact extends BaseModule
{
- private static function batchActions(App $a)
+ private static function batchActions()
{
if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
return;
}
}
if ($count_actions > 0) {
- info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
+ info(DI::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;
}
}
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
- notice(L10n::t('Could not access contact record.') . EOL);
- $a->internalRedirect('contact');
+ notice(DI::l10n()->t('Could not access contact record.') . EOL);
+ DI::baseUrl()->redirect('contact');
return; // NOTREACHED
}
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);
+ notice(DI::l10n()->t('Could not locate selected profile.') . EOL);
return;
}
}
$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,
);
if (DBA::isResult($r)) {
- info(L10n::t('Contact updated.') . EOL);
+ info(DI::l10n()->t('Contact updated.') . EOL);
} else {
- notice(L10n::t('Failed to update contact record.') . EOL);
+ notice(DI::l10n()->t('Failed to update contact record.') . EOL);
}
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
private static function updateContactFromProbe($contact_id)
{
- $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
+ $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;
- }
-
- 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)
{
if (!local_user()) {
return Login::form($_SERVER['REQUEST_URI']);
}
- $a = self::getApp();
+ $a = DI::app();
- $nets = defaults($_GET, 'nets', '');
- $rel = defaults($_GET, 'rel' , '');
+ $nets = $_GET['nets'] ?? '';
+ $rel = $_GET['rel'] ?? '';
- if (empty($a->page['aside'])) {
- $a->page['aside'] = '';
+ if (empty(DI::page()['aside'])) {
+ DI::page()['aside'] = '';
}
$contact_id = null;
if ($contact['self']) {
// @TODO: Replace with parameter from router
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
- $a->internalRedirect('profile/' . $contact['nick']);
+ DI::baseUrl()->redirect('profile/' . $contact['nick']);
} else {
- $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
+ DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
}
}
'$name' => $contact['name'],
'$photo' => $contact['photo'],
'$url' => Model\Contact::magicLinkByContact($contact, $contact['url']),
- '$addr' => defaults($contact, 'addr', ''),
+ '$addr' => $contact['addr'] ?? '',
'$network_link' => $network_link,
- '$network' => L10n::t('Network:'),
+ '$network' => DI::l10n()->t('Network:'),
'$account_type' => Model\Contact::getAccountType($contact),
- '$follow' => L10n::t('Follow'),
+ '$follow' => DI::l10n()->t('Follow'),
'$follow_link' => $follow_link,
- '$unfollow' => L10n::t('Unfollow'),
+ '$unfollow' => DI::l10n()->t('Unfollow'),
'$unfollow_link' => $unfollow_link,
- '$wallmessage' => L10n::t('Message'),
+ '$wallmessage' => DI::l10n()->t('Message'),
'$wallmessage_link' => $wallmessage_link,
]);
$groups_widget = null;
}
- $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget;
+ DI::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' => $a->getBaseURL(true),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ '$baseurl' => DI::baseUrl()->get(true),
]);
$sort_type = 0;
Nav::setSelected('contact');
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return Login::form();
}
$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
if (!DBA::isResult($orig_record)) {
- throw new NotFoundException(L10n::t('Contact not found'));
+ throw new NotFoundException(DI::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
}
self::blockContact($contact_id);
$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
- info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
+ info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')) . EOL);
- $a->internalRedirect('contact/' . $contact_id);
+ DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
}
self::ignoreContact($contact_id);
$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
- info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
+ info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')) . EOL);
- $a->internalRedirect('contact/' . $contact_id);
+ DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
}
$r = self::archiveContact($contact_id, $orig_record);
if ($r) {
$archived = (($orig_record['archive']) ? 0 : 1);
- info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
+ info((($archived) ? DI::l10n()->t('Contact has been archived') : DI::l10n()->t('Contact has been unarchived')) . EOL);
}
- $a->internalRedirect('contact/' . $contact_id);
+ DI::baseUrl()->redirect('contact/' . $contact_id);
// NOTREACHED
}
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) {
}
}
- $a->page['aside'] = '';
+ DI::page()['aside'] = '';
return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
- '$header' => L10n::t('Drop contact'),
+ '$header' => DI::l10n()->t('Drop contact'),
'$contact' => self::getContactTemplateVars($orig_record),
'$method' => 'get',
- '$message' => L10n::t('Do you really want to delete this contact?'),
+ '$message' => DI::l10n()->t('Do you really want to delete this contact?'),
'$extra_inputs' => $inputs,
- '$confirm' => L10n::t('Yes'),
+ '$confirm' => DI::l10n()->t('Yes'),
'$confirm_url' => $query['base'],
'$confirm_name' => 'confirmed',
- '$cancel' => L10n::t('Cancel'),
+ '$cancel' => DI::l10n()->t('Cancel'),
]);
}
// 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);
+ info(DI::l10n()->t('Contact has been removed.') . EOL);
- $a->internalRedirect('contact');
+ DI::baseUrl()->redirect('contact');
// NOTREACHED
}
if ($cmd === 'posts') {
}
}
- $_SESSION['return_path'] = $a->query_string;
+ $_SESSION['return_path'] = DI::args()->getQueryString();
if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
$contact = $a->data['contact'];
- $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
- '$baseurl' => $a->getBaseURL(true),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
+ '$baseurl' => DI::baseUrl()->get(true),
]);
$contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
switch ($contact['rel']) {
case Model\Contact::FRIEND:
$dir_icon = 'images/lrarrow.gif';
- $relation_text = L10n::t('You are mutual friends with %s');
+ $relation_text = DI::l10n()->t('You are mutual friends with %s');
break;
case Model\Contact::FOLLOWER;
$dir_icon = 'images/larrow.gif';
- $relation_text = L10n::t('You are sharing with %s');
+ $relation_text = DI::l10n()->t('You are sharing with %s');
break;
case Model\Contact::SHARING;
$dir_icon = 'images/rarrow.gif';
- $relation_text = L10n::t('%s is sharing with you');
+ $relation_text = DI::l10n()->t('%s is sharing with you');
break;
default:
$sparkle = '';
}
- $insecure = L10n::t('Private communications are not available for this contact.');
+ $insecure = DI::l10n()->t('Private communications are not available for this contact.');
- $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
+ $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? DI::l10n()->t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
if ($contact['last-update'] > DBA::NULL_DATETIME) {
- $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
+ $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? DI::l10n()->t('(Update was successful)') : DI::l10n()->t('(Update was not successful)'));
}
- $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
+ $lblsuggest = (($contact['network'] === Protocol::DFRN) ? DI::l10n()->t('Suggest friends') : '');
$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 = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
// tabs
$tab_str = self::getTabsHTML($a, $contact, 3);
- $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
+ $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : '');
$fetch_further_information = null;
if ($contact['network'] == Protocol::FEED) {
$fetch_further_information = [
'fetch_further_information',
- L10n::t('Fetch further information for feeds'),
+ DI::l10n()->t('Fetch further information for feeds'),
$contact['fetch_further_information'],
- L10n::t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'),
+ DI::l10n()->t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'),
[
- '0' => L10n::t('Disabled'),
- '1' => L10n::t('Fetch information'),
- '3' => L10n::t('Fetch keywords'),
- '2' => L10n::t('Fetch information and keywords')
+ '0' => DI::l10n()->t('Disabled'),
+ '1' => DI::l10n()->t('Fetch information'),
+ '3' => DI::l10n()->t('Fetch keywords'),
+ '2' => DI::l10n()->t('Fetch information and keywords')
]
];
}
$contact_actions = self::getContactActions($contact);
if ($contact['uid'] != 0) {
- $lbl_vis1 = L10n::t('Profile Visibility');
- $lbl_info1 = L10n::t('Contact Information / Notes');
- $contact_settings_label = L10n::t('Contact Settings');
+ $lbl_vis1 = DI::l10n()->t('Profile Visibility');
+ $lbl_info1 = DI::l10n()->t('Contact Information / Notes');
+ $contact_settings_label = DI::l10n()->t('Contact Settings');
} else {
$lbl_vis1 = null;
$lbl_info1 = null;
$tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
$o .= Renderer::replaceMacros($tpl, [
- '$header' => L10n::t('Contact'),
+ '$header' => DI::l10n()->t('Contact'),
'$tab_str' => $tab_str,
- '$submit' => L10n::t('Submit'),
+ '$submit' => DI::l10n()->t('Submit'),
'$lbl_vis1' => $lbl_vis1,
- '$lbl_vis2' => L10n::t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
+ '$lbl_vis2' => DI::l10n()->t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
'$lbl_info1' => $lbl_info1,
- '$lbl_info2' => L10n::t('Their personal note'),
+ '$lbl_info2' => DI::l10n()->t('Their personal note'),
'$reason' => trim(Strings::escapeTags($contact['reason'])),
- '$infedit' => L10n::t('Edit contact notes'),
+ '$infedit' => DI::l10n()->t('Edit contact notes'),
'$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
'$relation_text' => $relation_text,
- '$visit' => L10n::t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
- '$blockunblock' => L10n::t('Block/Unblock contact'),
- '$ignorecont' => L10n::t('Ignore contact'),
- '$lblcrepair' => L10n::t('Repair URL settings'),
- '$lblrecent' => L10n::t('View conversations'),
+ '$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,
'$poll_interval' => $poll_interval,
'$poll_enabled' => $poll_enabled,
- '$lastupdtext' => L10n::t('Last update:'),
+ '$lastupdtext' => DI::l10n()->t('Last update:'),
'$lost_contact' => $lost_contact,
- '$updpub' => L10n::t('Update public posts'),
+ '$updpub' => DI::l10n()->t('Update public posts'),
'$last_update' => $last_update,
- '$udnow' => L10n::t('Update now'),
+ '$udnow' => DI::l10n()->t('Update now'),
'$profile_select' => $profile_select,
'$contact_id' => $contact['id'],
- '$block_text' => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),
- '$ignore_text' => ($contact['readonly'] ? L10n::t('Unignore') : L10n::t('Ignore')),
+ '$block_text' => ($contact['blocked'] ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
+ '$ignore_text' => ($contact['readonly'] ? DI::l10n()->t('Unignore') : DI::l10n()->t('Ignore')),
'$insecure' => (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]) ? '' : $insecure),
'$info' => $contact['info'],
'$cinfo' => ['info', '', $contact['info'], ''],
- '$blocked' => ($contact['blocked'] ? L10n::t('Currently blocked') : ''),
- '$ignored' => ($contact['readonly'] ? L10n::t('Currently ignored') : ''),
- '$archived' => ($contact['archive'] ? L10n::t('Currently archived') : ''),
- '$pending' => ($contact['pending'] ? L10n::t('Awaiting connection acknowledge') : ''),
- '$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')],
+ '$blocked' => ($contact['blocked'] ? DI::l10n()->t('Currently blocked') : ''),
+ '$ignored' => ($contact['readonly'] ? DI::l10n()->t('Currently ignored') : ''),
+ '$archived' => ($contact['archive'] ? DI::l10n()->t('Currently archived') : ''),
+ '$pending' => ($contact['pending'] ? DI::l10n()->t('Awaiting connection acknowledge') : ''),
+ '$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', 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')],
+ '$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'],
'$name' => $contact['name'],
'$dir_icon' => $dir_icon,
'$sparkle' => $sparkle,
'$url' => $url,
- '$profileurllabel'=> L10n::t('Profile URL'),
+ '$profileurllabel'=> DI::l10n()->t('Profile URL'),
'$profileurl' => $contact['url'],
'$account_type' => Model\Contact::getAccountType($contact),
'$location' => BBCode::convert($contact['location']),
- '$location_label' => L10n::t('Location:'),
+ '$location_label' => DI::l10n()->t('Location:'),
'$xmpp' => BBCode::convert($contact['xmpp']),
- '$xmpp_label' => L10n::t('XMPP:'),
+ '$xmpp_label' => DI::l10n()->t('XMPP:'),
'$about' => BBCode::convert($contact['about'], false),
- '$about_label' => L10n::t('About:'),
+ '$about_label' => DI::l10n()->t('About:'),
'$keywords' => $contact['keywords'],
- '$keywords_label' => L10n::t('Tags:'),
- '$contact_action_button' => L10n::t('Actions'),
+ '$keywords_label' => DI::l10n()->t('Tags:'),
+ '$contact_action_button' => DI::l10n()->t('Actions'),
'$contact_actions'=> $contact_actions,
- '$contact_status' => L10n::t('Status'),
+ '$contact_status' => DI::l10n()->t('Status'),
'$contact_settings_label' => $contact_settings_label,
- '$contact_profile_label' => L10n::t('Profile'),
+ '$contact_profile_label' => DI::l10n()->t('Profile'),
]);
$arr = ['contact' => $contact, 'output' => $o];
return $arr['output'];
}
+ $select_uid = local_user();
+
// @TODO: Replace with parameter from router
- $type = defaults($a->argv, 1, '');
+ $type = $a->argv[1] ?? '';
switch ($type) {
case 'blocked':
- $sql_extra = " AND `blocked` = 1";
+ $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` = 1 AND `blocked` = 0";
+ $sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
break;
case 'ignored':
- $sql_extra = " AND `readonly` = 1 AND `blocked` = 0";
+ $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` = 1 AND `blocked` = 0";
+ $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 `blocked` = 0";
+ $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' , '')));
- $rel = Strings::escapeTags(trim(defaults($_GET, 'rel' , '')));
+ $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
+ $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
+ $rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
$tabs = [
[
- 'label' => L10n::t('All Contacts'),
+ 'label' => DI::l10n()->t('All Contacts'),
'url' => 'contact',
'sel' => !$type ? 'active' : '',
- 'title' => L10n::t('Show all contacts'),
+ 'title' => DI::l10n()->t('Show all contacts'),
'id' => 'showall-tab',
'accesskey' => 'l',
],
[
- 'label' => L10n::t('Blocked'),
+ 'label' => DI::l10n()->t('Pending'),
+ 'url' => 'contact/pending',
+ 'sel' => $type == 'pending' ? 'active' : '',
+ 'title' => DI::l10n()->t('Only show pending contacts'),
+ 'id' => 'showpending-tab',
+ 'accesskey' => 'p',
+ ],
+ [
+ 'label' => DI::l10n()->t('Blocked'),
'url' => 'contact/blocked',
'sel' => $type == 'blocked' ? 'active' : '',
- 'title' => L10n::t('Only show blocked contacts'),
+ 'title' => DI::l10n()->t('Only show blocked contacts'),
'id' => 'showblocked-tab',
'accesskey' => 'b',
],
[
- 'label' => L10n::t('Ignored'),
+ 'label' => DI::l10n()->t('Ignored'),
'url' => 'contact/ignored',
'sel' => $type == 'ignored' ? 'active' : '',
- 'title' => L10n::t('Only show ignored contacts'),
+ 'title' => DI::l10n()->t('Only show ignored contacts'),
'id' => 'showignored-tab',
'accesskey' => 'i',
],
[
- 'label' => L10n::t('Archived'),
+ 'label' => DI::l10n()->t('Archived'),
'url' => 'contact/archived',
'sel' => $type == 'archived' ? 'active' : '',
- 'title' => L10n::t('Only show archived contacts'),
+ 'title' => DI::l10n()->t('Only show archived contacts'),
'id' => 'showarchived-tab',
'accesskey' => 'y',
],
[
- 'label' => L10n::t('Hidden'),
+ 'label' => DI::l10n()->t('Hidden'),
'url' => 'contact/hidden',
'sel' => $type == 'hidden' ? 'active' : '',
- 'title' => L10n::t('Only show hidden contacts'),
+ 'title' => DI::l10n()->t('Only show hidden contacts'),
'id' => 'showhidden-tab',
'accesskey' => 'h',
],
[
- 'label' => L10n::t('Groups'),
+ 'label' => DI::l10n()->t('Groups'),
'url' => 'group',
'sel' => '',
- 'title' => L10n::t('Organize your contact groups'),
+ 'title' => DI::l10n()->t('Organize your contact groups'),
'id' => 'contactgroups-tab',
'accesskey' => 'e',
],
$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');
+ case 'followers': $header = DI::l10n()->t('Followers'); break;
+ case 'following': $header = DI::l10n()->t('Following'); break;
+ case 'mutuals': $header = DI::l10n()->t('Mutual friends'); break;
+ default: $header = DI::l10n()->t('Contacts');
}
switch ($type) {
- 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;
+ case 'pending': $header .= ' - ' . DI::l10n()->t('Pending'); break;
+ case 'blocked': $header .= ' - ' . DI::l10n()->t('Blocked'); break;
+ case 'hidden': $header .= ' - ' . DI::l10n()->t('Hidden'); break;
+ case 'ignored': $header .= ' - ' . DI::l10n()->t('Ignored'); break;
+ case 'archived': $header .= ' - ' . DI::l10n()->t('Archived'); break;
}
$header .= $nets ? ' - ' . ContactSelector::networkToName($nets) : '';
'$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,
+ '$desc' => DI::l10n()->t('Search your contacts'),
+ '$finding' => $searching ? DI::l10n()->t('Results for: %s', $search) : '',
+ '$submit' => DI::l10n()->t('Find'),
+ '$cmd' => DI::args()->getCommand(),
'$contacts' => $contacts,
- '$contact_drop_confirm' => L10n::t('Do you really want to delete this contact?'),
+ '$contact_drop_confirm' => DI::l10n()->t('Do you really want to delete this contact?'),
'multiselect' => 1,
'$batch_actions' => [
- 'contacts_batch_update' => L10n::t('Update'),
- 'contacts_batch_block' => L10n::t('Block') . '/' . L10n::t('Unblock'),
- 'contacts_batch_ignore' => L10n::t('Ignore') . '/' . L10n::t('Unignore'),
- 'contacts_batch_archive' => L10n::t('Archive') . '/' . L10n::t('Unarchive'),
- 'contacts_batch_drop' => L10n::t('Delete'),
+ 'contacts_batch_update' => DI::l10n()->t('Update'),
+ 'contacts_batch_block' => DI::l10n()->t('Block') . '/' . DI::l10n()->t('Unblock'),
+ 'contacts_batch_ignore' => DI::l10n()->t('Ignore') . '/' . DI::l10n()->t('Unignore'),
+ 'contacts_batch_archive' => DI::l10n()->t('Archive') . '/' . DI::l10n()->t('Unarchive'),
+ 'contacts_batch_drop' => DI::l10n()->t('Delete'),
],
- '$h_batch_actions' => L10n::t('Batch Actions'),
+ '$h_batch_actions' => DI::l10n()->t('Batch Actions'),
'$paginate' => $pager->renderFull($total),
]);
}
/**
- * @brief List of pages for the Contact TabBar
+ * List of pages for the Contact TabBar
*
* Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
*
// tabs
$tabs = [
[
- 'label' => L10n::t('Status'),
+ 'label' => DI::l10n()->t('Status'),
'url' => "contact/" . $contact['id'] . "/conversations",
'sel' => (($active_tab == 1) ? 'active' : ''),
- 'title' => L10n::t('Conversations started by this contact'),
+ 'title' => DI::l10n()->t('Conversations started by this contact'),
'id' => 'status-tab',
'accesskey' => 'm',
],
[
- 'label' => L10n::t('Posts and Comments'),
+ 'label' => DI::l10n()->t('Posts and Comments'),
'url' => "contact/" . $contact['id'] . "/posts",
'sel' => (($active_tab == 2) ? 'active' : ''),
- 'title' => L10n::t('Status Messages and Posts'),
+ 'title' => DI::l10n()->t('Status Messages and Posts'),
'id' => 'posts-tab',
'accesskey' => 'p',
],
[
- 'label' => L10n::t('Profile'),
+ 'label' => DI::l10n()->t('Profile'),
'url' => "contact/" . $contact['id'],
'sel' => (($active_tab == 3) ? 'active' : ''),
- 'title' => L10n::t('Profile Details'),
+ 'title' => DI::l10n()->t('Profile Details'),
'id' => 'profile-tab',
'accesskey' => 'o',
]
// Show this tab only if there is visible friend list
$x = Model\GContact::countAllFriends(local_user(), $contact['id']);
if ($x) {
- $tabs[] = ['label' => L10n::t('Contacts'),
+ $tabs[] = ['label' => DI::l10n()->t('Contacts'),
'url' => "allfriends/" . $contact['id'],
'sel' => (($active_tab == 4) ? 'active' : ''),
- 'title' => L10n::t('View all contacts'),
+ 'title' => DI::l10n()->t('View all contacts'),
'id' => 'allfriends-tab',
'accesskey' => 't'];
}
// Show this tab only if there is visible common friend list
$common = Model\GContact::countCommonFriends(local_user(), $contact['id']);
if ($common) {
- $tabs[] = ['label' => L10n::t('Common Friends'),
+ $tabs[] = ['label' => DI::l10n()->t('Common Friends'),
'url' => "common/loc/" . local_user() . "/" . $contact['id'],
'sel' => (($active_tab == 5) ? 'active' : ''),
- 'title' => L10n::t('View all common friends'),
+ 'title' => DI::l10n()->t('View all common friends'),
'id' => 'common-loc-tab',
'accesskey' => 'd'
];
}
if (!empty($contact['uid'])) {
- $tabs[] = ['label' => L10n::t('Advanced'),
+ $tabs[] = ['label' => DI::l10n()->t('Advanced'),
'url' => 'crepair/' . $contact['id'],
'sel' => (($active_tab == 6) ? 'active' : ''),
- 'title' => L10n::t('Advanced Contact Settings'),
+ 'title' => DI::l10n()->t('Advanced Contact Settings'),
'id' => 'advanced-tab',
'accesskey' => 'r'
];
'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(DI::page(), $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
}
if (DBA::isResult($contact)) {
- $a->page['aside'] = '';
+ DI::page()['aside'] = '';
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
$o = self::getTabsHTML($a, $contact, 2);
if (DBA::isResult($contact)) {
- $a->page['aside'] = '';
+ DI::page()['aside'] = '';
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
- $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
+ $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
}
Model\Profile::load($a, '', 0, $profiledata, true);
$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 = DI::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 = DI::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 = DI::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 = 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';
- $alt_text = L10n::t('This is you');
+ $alt_text = DI::l10n()->t('This is you');
$url = $rr['url'];
$sparkle = '';
}
return [
- 'img_hover' => L10n::t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
- 'edit_hover'=> L10n::t('Edit contact'),
+ '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,
'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']),
+ 'network' => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
'nick' => $rr['nick'],
];
}
/**
- * @brief Gives a array with actions which can performed to a given contact
+ * Gives a array with actions which can performed to a given contact
*
* This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
*
// Provide friend suggestion only for Friendica contacts
if ($contact['network'] === Protocol::DFRN) {
$contact_actions['suggest'] = [
- 'label' => L10n::t('Suggest friends'),
+ 'label' => DI::l10n()->t('Suggest friends'),
'url' => 'fsuggest/' . $contact['id'],
'title' => '',
'sel' => '',
if ($poll_enabled) {
$contact_actions['update'] = [
- 'label' => L10n::t('Update now'),
+ 'label' => DI::l10n()->t('Update now'),
'url' => 'contact/' . $contact['id'] . '/update',
'title' => '',
'sel' => '',
}
$contact_actions['block'] = [
- 'label' => (intval($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block')),
+ 'label' => (intval($contact['blocked']) ? DI::l10n()->t('Unblock') : DI::l10n()->t('Block')),
'url' => 'contact/' . $contact['id'] . '/block',
- 'title' => L10n::t('Toggle Blocked status'),
+ 'title' => DI::l10n()->t('Toggle Blocked status'),
'sel' => (intval($contact['blocked']) ? 'active' : ''),
'id' => 'toggle-block',
];
$contact_actions['ignore'] = [
- 'label' => (intval($contact['readonly']) ? L10n::t('Unignore') : L10n::t('Ignore')),
+ 'label' => (intval($contact['readonly']) ? DI::l10n()->t('Unignore') : DI::l10n()->t('Ignore')),
'url' => 'contact/' . $contact['id'] . '/ignore',
- 'title' => L10n::t('Toggle Ignored status'),
+ 'title' => DI::l10n()->t('Toggle Ignored status'),
'sel' => (intval($contact['readonly']) ? 'active' : ''),
'id' => 'toggle-ignore',
];
if ($contact['uid'] != 0) {
$contact_actions['archive'] = [
- 'label' => (intval($contact['archive']) ? L10n::t('Unarchive') : L10n::t('Archive')),
+ 'label' => (intval($contact['archive']) ? DI::l10n()->t('Unarchive') : DI::l10n()->t('Archive')),
'url' => 'contact/' . $contact['id'] . '/archive',
- 'title' => L10n::t('Toggle Archive status'),
+ 'title' => DI::l10n()->t('Toggle Archive status'),
'sel' => (intval($contact['archive']) ? 'active' : ''),
'id' => 'toggle-archive',
];
$contact_actions['delete'] = [
- 'label' => L10n::t('Delete'),
+ 'label' => DI::l10n()->t('Delete'),
'url' => 'contact/' . $contact['id'] . '/drop',
- 'title' => L10n::t('Delete contact'),
+ 'title' => DI::l10n()->t('Delete contact'),
'sel' => '',
'id' => 'delete',
];
projects / friendica.git / blobdiff