use Friendica\BaseModule;
use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
+use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
-use Friendica\Core\Addon;
+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\Model;
+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\Core\ACL;
-use Friendica\Module\Login;
+use Friendica\Util\Strings;
/**
* Manages and show Contacts and their content
*
* @brief manages contacts
*/
-class Contact extends BaseModule
+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'])) {
- goaway('profile/' . $contact['nick']);
- } else {
- goaway('profile/' . $contact['nick'] . '?tab=profile');
- }
- }
-
- $a->data['contact'] = $contact;
-
- if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
- $networkname = format_network_name($contact['network'], $contact['url']);
- } else {
- $networkname = '';
- }
-
- /// @TODO Add nice spaces
- $vcard_widget = replace_macros(get_markup_template('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'] .= replace_macros(get_markup_template("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 = get_markup_template("contacts-head.tpl");
- $a->page['htmlhead'] .= replace_macros($tpl, [
- '$baseurl' => System::baseUrl(true),
- '$base' => $base
- ]);
- }
-
private static function batchActions(App $a)
{
if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
$contacts_id = $_POST['contact_batch'];
- $stmt = DBA::select('contact', ['id'], ['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;
foreach ($orig_records as $orig_record) {
$contact_id = $orig_record['id'];
}
}
if ($count_actions > 0) {
- info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions));
+ info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
}
- goaway('contact');
+ $a->internalRedirect('contact');
}
public static function post()
return;
}
- if ($a->argv[1] === "batch") {
+ // @TODO: Replace with parameter from router
+ if ($a->argv[1] === 'batch') {
self::batchActions($a);
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);
- goaway('contact');
+ $a->internalRedirect('contact');
return; // NOTREACHED
}
- Addon::callHooks('contact_edit_post', $_POST);
+ Hook::callAll('contact_edit_post', $_POST);
$profile_id = intval(defaults($_POST, 'profile-assign', 0));
if ($profile_id) {
$fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
- $ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+ $ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
$priority = intval(defaults($_POST, 'poll', 0));
if ($priority > 5 || $priority < 0) {
$priority = 0;
}
- $info = escape_tags(trim($_POST['info']));
-
- $r = DBA::update('contact',
- ['profile-id' => $profile_id,
- 'priority' => $priority,
- 'info' => $info,
- 'hidden' => $hidden,
- 'notify_new_posts' => $notify,
- 'fetch_further_information' => $fetch_further_information,
- 'ffi_keyword_blacklist' => $ffi_keyword_blacklist],
- ['id' => $contact_id, 'uid' => local_user()]);
+ $info = Strings::escapeHtml(trim(defaults($_POST, 'info', '')));
+
+ $r = DBA::update('contact', [
+ 'profile-id' => $profile_id,
+ 'priority' => $priority,
+ 'info' => $info,
+ 'hidden' => $hidden,
+ 'notify_new_posts' => $notify,
+ 'fetch_further_information' => $fetch_further_information,
+ 'ffi_keyword_blacklist' => $ffi_keyword_blacklist],
+ ['id' => $contact_id, 'uid' => local_user()]
+ );
if (DBA::isResult($r)) {
info(L10n::t('Contact updated.') . EOL);
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;
}
- $uid = $contact["uid"];
+ $uid = $contact['uid'];
- if ($contact["network"] == Protocol::OSTATUS) {
- $result = Model\Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]);
+ if ($contact['network'] == Protocol::OSTATUS) {
+ $result = Model\Contact::createFromProbe($uid, $contact['url'], false, $contact['network']);
if ($result['success']) {
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
}
} else {
// pull feed and consume it, which should subscribe to the hub.
- Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
+ Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
}
}
private static function updateContactFromProbe($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;
}
- $uid = $contact["uid"];
+ $uid = $contact['uid'];
- $data = Probe::uri($contact["url"], "", 0, false);
+ $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"])) {
+ // 'Feed' or 'Unknown' is mostly a sign of communication problems
+ if ((in_array($data['network'], [Protocol::FEED, Protocol::PHANTOM])) && ($data['network'] != $contact['network'])) {
return;
}
}
}
- $fields['nurl'] = normalise_link($data['url']);
+ $fields['nurl'] = Strings::normaliseLink($data['url']);
if (!empty($data['priority'])) {
$fields['priority'] = intval($data['priority']);
return;
}
- $r = DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
+ 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);
// Update the entry in the gcontact table
- Model\GContact::updateFromProbe($data["url"]);
+ Model\GContact::updateFromProbe($data['url']);
}
private static function blockContact($contact_id)
private static function archiveContact($contact_id, $orig_record)
{
- $archived = (($orig_record['archive']) ? 0 : 1);
+ $archived = (defaults($orig_record, 'archive', '') ? 0 : 1);
$r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]);
return DBA::isResult($r);
private static function dropContact($orig_record)
{
- $a = get_app();
-
- $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
- intval($a->user['uid'])
- );
- if (!DBA::isResult($r)) {
+ $owner = Model\User::getOwnerDataById(local_user());
+ if (!DBA::isResult($owner)) {
return;
}
- Model\Contact::terminateFriendship($r[0], $orig_record, true);
+ Model\Contact::terminateFriendship($owner, $orig_record, true);
Model\Contact::remove($orig_record['id']);
}
public static function content($update = 0)
{
+ if (!local_user()) {
+ return Login::form($_SERVER['REQUEST_URI']);
+ }
+
$a = self::getApp();
+
+ $nets = defaults($_GET, 'nets', '');
+ $rel = defaults($_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'])) {
+ $a->internalRedirect('profile/' . $contact['nick']);
+ } else {
+ $a->internalRedirect('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 = '';
+ }
+
+ $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
+ '$name' => $contact['name'],
+ '$photo' => $contact['photo'],
+ '$url' => Model\Contact::magicLinkByContact($contact, $contact['url']),
+ '$addr' => defaults($contact, 'addr', ''),
+ '$network_link' => $network_link,
+ '$network' => L10n::t('Network:'),
+ '$account_type' => Model\Contact::getAccountType($contact)
+ ]);
+
+ $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' => $a->getBaseURL(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);
- goaway('contact');
- return; // NOTREACHED
+ throw new NotFoundException(L10n::t('Contact not found'));
}
if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
self::updateContactFromPoll($contact_id);
- goaway('contact/' . $contact_id);
+ $a->internalRedirect('contact/' . $contact_id);
// NOTREACHED
}
if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
self::updateContactFromProbe($contact_id);
- goaway('crepair/' . $contact_id);
+ $a->internalRedirect('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);
- goaway('contact/' . $contact_id);
- return; // NOTREACHED
+ $a->internalRedirect('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);
- goaway('contact/' . $contact_id);
- return; // NOTREACHED
+ $a->internalRedirect('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);
}
- goaway('contact/' . $contact_id);
- return; // NOTREACHED
+ $a->internalRedirect('contact/' . $contact_id);
+ // NOTREACHED
}
if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
$a->page['aside'] = '';
- return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [
+ return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [
'$header' => L10n::t('Drop contact'),
'$contact' => self::getContactTemplateVars($orig_record),
'$method' => 'get',
}
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
- goaway('contact');
+ $a->internalRedirect('contact');
}
self::dropContact($orig_record);
info(L10n::t('Contact has been removed.') . EOL);
- goaway('contact');
- return; // NOTREACHED
+ $a->internalRedirect('contact');
+ // NOTREACHED
}
if ($cmd === 'posts') {
return self::getPostsHTML($a, $contact_id);
}
}
- $_SESSION['return_url'] = $a->query_string;
+ $_SESSION['return_path'] = $a->query_string;
if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
- $contact_id = $a->data['contact']['id'];
$contact = $a->data['contact'];
- $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [
+ $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
'$baseurl' => $a->getBaseURL(true),
]);
- $contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
+ $contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
$contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
$dir_icon = '';
}
if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
- $relation_text = "";
+ $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) {
$insecure = L10n::t('Private communications are not available for this contact.');
- $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
+ $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
- if ($contact['last-update'] > NULL_DATE) {
- $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t("\x28Update was successful\x29") : L10n::t("\x28Update was not successful\x29"));
+ 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)'));
}
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? 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 = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url']));
// tabs
$tab_str = self::getTabsHTML($a, $contact, 3);
- $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $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()) ? L10n::t('Communications lost with this contact!') : '');
$fetch_further_information = null;
if ($contact['network'] == Protocol::FEED) {
'fetch_further_information',
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."),
- ['0' => L10n::t('Disabled'),
+ 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')
$poll_interval = null;
if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
- $poll_interval = ContactSelector::pollInterval($contact['priority'], (!$poll_enabled));
+ $poll_interval = ContactSelector::pollInterval($contact['priority'], !$poll_enabled);
}
$profile_select = null;
if ($contact['network'] == Protocol::DFRN) {
- $profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== Protocol::DFRN) ? true : false));
+ $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 ($contact['uid'] && in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
- $follow = $a->getBaseURL(true) . "/unfollow?url=" . urlencode($contact["url"]);
- $follow_text = L10n::t("Disconnect/Unfollow");
+ $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");
+ } elseif(!$contact['pending']) {
+ $follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']);
+ $follow_text = L10n::t('Connect/Follow');
}
// Load contactact related actions like hide, suggest, delete and others
$contact_settings_label = null;
}
- $tpl = get_markup_template("contact_edit.tpl");
- $o .= replace_macros($tpl, [
- '$header' => L10n::t("Contact"),
- '$tab_str' => $tab_str,
- '$submit' => 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_info1' => $lbl_info1,
- '$lbl_info2' => L10n::t('Their personal note'),
- '$reason' => trim(notags($contact['reason'])),
- '$infedit' => 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'),
- '$lblsuggest' => $lblsuggest,
- '$nettype' => $nettype,
- '$poll_interval' => $poll_interval,
- '$poll_enabled' => $poll_enabled,
- '$lastupdtext' => L10n::t('Last update:'),
- '$lost_contact' => $lost_contact,
- '$updpub' => L10n::t('Update public posts'),
- '$last_update' => $last_update,
- '$udnow' => L10n::t('Update now'),
- '$follow' => $follow,
- '$follow_text' => $follow_text,
+ $tpl = Renderer::getMarkupTemplate('contact_edit.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$header' => L10n::t('Contact'),
+ '$tab_str' => $tab_str,
+ '$submit' => 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_info1' => $lbl_info1,
+ '$lbl_info2' => L10n::t('Their personal note'),
+ '$reason' => trim(Strings::escapeTags($contact['reason'])),
+ '$infedit' => 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'),
+ '$lblsuggest' => $lblsuggest,
+ '$nettype' => $nettype,
+ '$poll_interval' => $poll_interval,
+ '$poll_enabled' => $poll_enabled,
+ '$lastupdtext' => L10n::t('Last update:'),
+ '$lost_contact' => $lost_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')),
- '$ignore_text' => ($contact['readonly'] ? L10n::t('Unignore') : 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')],
+ '$contact_id' => $contact['id'],
+ '$block_text' => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),
+ '$ignore_text' => ($contact['readonly'] ? L10n::t('Unignore') : 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')],
'$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']),
- '$dir_icon' => $dir_icon,
- '$sparkle' => $sparkle,
- '$url' => $url,
- '$profileurllabel' => L10n::t('Profile URL'),
- '$profileurl' => $contact['url'],
- '$account_type' => Model\Contact::getAccountType($contact),
- '$location' => BBCode::convert($contact["location"]),
- '$location_label' => L10n::t("Location:"),
- '$xmpp' => BBCode::convert($contact["xmpp"]),
- '$xmpp_label' => L10n::t("XMPP:"),
- '$about' => BBCode::convert($contact["about"], false),
- '$about_label' => L10n::t("About:"),
- '$keywords' => $contact["keywords"],
- '$keywords_label' => L10n::t("Tags:"),
- '$contact_action_button' => L10n::t("Actions"),
- '$contact_actions' => $contact_actions,
- '$contact_status' => L10n::t("Status"),
+ '$photo' => $contact['photo'],
+ '$name' => $contact['name'],
+ '$dir_icon' => $dir_icon,
+ '$sparkle' => $sparkle,
+ '$url' => $url,
+ '$profileurllabel'=> L10n::t('Profile URL'),
+ '$profileurl' => $contact['url'],
+ '$account_type' => Model\Contact::getAccountType($contact),
+ '$location' => BBCode::convert($contact['location']),
+ '$location_label' => L10n::t('Location:'),
+ '$xmpp' => BBCode::convert($contact['xmpp']),
+ '$xmpp_label' => L10n::t('XMPP:'),
+ '$about' => BBCode::convert($contact['about'], false),
+ '$about_label' => L10n::t('About:'),
+ '$keywords' => $contact['keywords'],
+ '$keywords_label' => L10n::t('Tags:'),
+ '$contact_action_button' => L10n::t('Actions'),
+ '$contact_actions'=> $contact_actions,
+ '$contact_status' => L10n::t('Status'),
'$contact_settings_label' => $contact_settings_label,
- '$contact_profile_label' => L10n::t("Profile"),
+ '$contact_profile_label' => L10n::t('Profile'),
]);
$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 ";
+ // @TODO: Replace with parameter from router
+ $type = defaults($a->argv, 1, '');
+
+ switch ($type) {
+ case 'blocked':
+ $sql_extra = " AND `blocked` = 1";
+ break;
+ case 'hidden':
+ $sql_extra = " AND `hidden` = 1 AND `blocked` = 0";
+ break;
+ case 'ignored':
+ $sql_extra = " AND `readonly` = 1 AND `blocked` = 0";
+ break;
+ case 'archived':
+ $sql_extra = " AND `archive` = 1 AND `blocked` = 0";
+ break;
+ default:
+ $sql_extra = " AND `blocked` = 0";
}
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
- $search = notags(trim(defaults($_GET, 'search', '')));
- $nets = notags(trim(defaults($_GET, 'nets' , '')));
+ $search = Strings::escapeTags(trim(defaults($_GET, 'search', '')));
+ $nets = Strings::escapeTags(trim(defaults($_GET, 'nets' , '')));
+ $rel = Strings::escapeTags(trim(defaults($_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('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 = get_markup_template('common_tabs.tpl');
- $t = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+ $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+ $t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
$total = 0;
$searching = false;
if ($search) {
$searching = true;
$search_hdr = $search;
- $search_txt = DBA::escape(protect_sprintf(preg_quote($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') ";
}
$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)) : '');
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
intval($_SESSION['uid'])
);
if (DBA::isResult($r)) {
- $a->setPagerTotal($r[0]['total']);
$total = $r[0]['total'];
}
+ $pager = new Pager($a->query_string);
$sql_extra3 = Widget::unavailableNetworks();
$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']),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
+ $pager->getStart(),
+ $pager->getItemsPerPage()
);
if (DBA::isResult($r)) {
foreach ($r as $rr) {
}
}
- $tpl = get_markup_template("contacts-template.tpl");
- $o .= replace_macros($tpl, [
- '$baseurl' => System::baseUrl(),
- '$header' => L10n::t('Contacts') . (($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,
- '$contacts' => $contacts,
+ 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 '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, [
+ '$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,
+ '$contacts' => $contacts,
'$contact_drop_confirm' => 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_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'),
],
'$h_batch_actions' => L10n::t('Batch Actions'),
- '$paginate' => paginate($a),
+ '$paginate' => $pager->renderFull($total),
]);
return $o;
*
* 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)
{
];
}
- $tab_tpl = get_markup_template('common_tabs.tpl');
- $tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]);
+ $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+ $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
return $tab_str;
}
}
}
- $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);
}
if (DBA::isResult($contact)) {
- $a->page['aside'] = "";
+ $a->page['aside'] = '';
- $profiledata = Model\Contact::getDetailsByURL($contact["url"]);
+ $profiledata = Model\Contact::getDetailsByURL($contact['url']);
- if (local_user()) {
- if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
- $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["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);
+ Model\Profile::load($a, '', 0, $profiledata, true);
+ $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
}
return $o;
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);
if (DBA::isResult($contact)) {
- $a->page['aside'] = "";
+ $a->page['aside'] = '';
- $profiledata = Model\Contact::getDetailsByURL($contact["url"]);
+ $profiledata = Model\Contact::getDetailsByURL($contact['url']);
- if (local_user()) {
- if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
- $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["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"]);
+ Model\Profile::load($a, '', 0, $profiledata, true);
+ $o .= Model\Contact::getPostsFromUrl($contact['url']);
}
return $o;
return [
'img_hover' => L10n::t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
- 'edit_hover' => 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' => htmlentities($rr['name']),
- 'username' => htmlentities($rr['name']),
+ 'edit_hover'=> 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,
+ 'sparkle' => $sparkle,
'itemurl' => defaults($rr, 'addr', $rr['url']),
- 'url' => $url,
- 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
- 'nick' => htmlentities($rr['nick']),
+ 'url' => $url,
+ 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+ 'nick' => $rr['nick'],
];
}
projects / friendica.git / blobdiff