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\ACL;
use Friendica\Core\Addon;
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\Module\Login;
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()
{
}
$nets = defaults($_GET, 'nets', '');
- if ($nets == "all") {
- $nets = "";
- }
- if (!x($a->page, 'aside')) {
+ if (empty($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']))) {
+ 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)) {
if ($contact['self']) {
if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
- goaway('profile/' . $contact['nick']);
+ $a->internalRedirect('profile/' . $contact['nick']);
} else {
- goaway('profile/' . $contact['nick'] . '?tab=profile');
+ $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
}
}
$a->data['contact'] = $contact;
- if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != Protocol::DFRN)) {
- $networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']);
+ if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
+ $networkname = Strings::formatNetworkName($contact['network'], $contact['url']);
} else {
$networkname = '';
}
/// @TODO Add nice spaces
- $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
- '$name' => htmlentities($a->data['contact']['name']),
- '$photo' => $a->data['contact']['photo'],
- '$url' => Model\Contact::MagicLink($a->data['contact']['url']),
- '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
+ $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [
+ '$name' => $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($a->data['contact'])
+ '$network' => L10n::t('Network:'),
+ '$account_type' => Model\Contact::getAccountType($contact)
]);
$findpeople_widget = '';
$networks_widget = '';
} else {
$vcard_widget = '';
- $networks_widget = Widget::networks('contacts', $nets);
+ $networks_widget = Widget::networks('contact', $nets);
if (isset($_GET['add'])) {
$follow_widget = Widget::follow($_GET['add']);
} else {
}
if ($contact['uid'] != 0) {
- $groups_widget = Model\Group::sidebarWidget('contacts', 'group', 'full', 'everyone', $contact_id);
+ $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,
+ $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
+ '$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, [
+ $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(true),
'$base' => $base
]);
$contacts_id = $_POST['contact_batch'];
- $stmt = DBA::select('contact', ['id'], ['id' => $contacts_id, 'id' => local_user(), 'self' => false]);
+ $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
$orig_records = DBA::toArray($stmt);
-
+
$count_actions = 0;
foreach ($orig_records as $orig_record) {
$contact_id = $orig_record['id'];
- if (defaults($_POST, 'contacts_batch_update')) {
+ if (!empty($_POST['contacts_batch_update'])) {
self::updateContactFromPoll($contact_id);
$count_actions++;
}
- if (defaults($_POST, 'contacts_batch_block')) {
+ if (!empty($_POST['contacts_batch_block'])) {
self::blockContact($contact_id);
$count_actions++;
}
- if (defaults($_POST, 'contacts_batch_ignore')) {
+ if (!empty($_POST['contacts_batch_ignore'])) {
self::ignoreContact($contact_id);
$count_actions++;
}
- if (defaults($_POST, 'contacts_batch_archive')) {
- $r = self::archiveContact($contact_id, $orig_record);
- if ($r) {
- $count_actions++;
- }
+ if (!empty($_POST['contacts_batch_archive'])
+ && self::archiveContact($contact_id, $orig_record)
+ ) {
+ $count_actions++;
}
- if (defaults($_POST, 'contacts_batch_drop')) {
+ if (!empty($_POST['contacts_batch_drop'])) {
self::dropContact($orig_record);
$count_actions++;
}
}
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") {
+ if ($a->argv[1] === 'batch') {
self::batchActions($a);
return;
}
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
notice(L10n::t('Could not access contact record.') . EOL);
- goaway('contacts');
+ $a->internalRedirect('contact');
return; // NOTREACHED
}
}
}
- $hidden = defaults($_POST['hidden']);
+ $hidden = !empty($_POST['hidden']);
- $notify = defaults($_POST['notify']);
+ $notify = !empty($_POST['notify']);
$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);
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');
}
}
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;
}
- $updatefields = ["name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
- "poco", "network", "alias"];
- $update = [];
+ $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 ($data['network'] == Protocol::OSTATUS) {
+ $result = Model\Contact::createFromProbe($uid, $data['url'], false);
if ($result['success']) {
- $update["subhub"] = true;
+ $fields['subhub'] = true;
}
}
foreach ($updatefields AS $field) {
- if (isset($data[$field]) && ($data[$field] != "")) {
- $update[$field] = $data[$field];
+ if (!empty($data[$field])) {
+ $fields[$field] = $data[$field];
}
}
- $update["nurl"] = normalise_link($data["url"]);
-
- $query = "";
-
- if (isset($data["priority"]) && ($data["priority"] != 0)) {
- $query = "'priority' => '" . intval($data["priority"]) . "'";
- }
-
- foreach ($update AS $key => $value) {
- if ($query != "") {
- $query .= ", ";
- }
+ $fields['nurl'] = Strings::normaliseLink($data['url']);
- $query .= "'" . $key . "' => '" . DBA::escape($value) . "'";
+ if (!empty($data['priority'])) {
+ $fields['priority'] = intval($data['priority']);
}
- if ($query == "") {
+ if (empty($fields)) {
return;
}
- $r = DBA::update('contact', $query, ['id' => $contact_id, 'uid' => local_user()]);
+ $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);
// 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']);
}
$a = self::getApp();
$sort_type = 0;
$o = '';
- Nav::setSelected('contacts');
+ Nav::setSelected('contact');
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
if (!DBA::isResult($orig_record)) {
notice(L10n::t('Could not access contact record.') . EOL);
- goaway('contacts');
+ $a->internalRedirect('contact');
return; // NOTREACHED
}
if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
self::updateContactFromPoll($contact_id);
- goaway('contacts/' . $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('contacts/' . $contact_id);
+ $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
- goaway('contacts/' . $contact_id);
+ $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
}
- goaway('contacts/' . $contact_id);
+ $a->internalRedirect('contact/' . $contact_id);
return; // NOTREACHED
}
if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
// Check if we should do HTML-based delete confirmation
- if (defaults($_REQUEST, 'confirm')) {
- // <form> can't take arguments in its "action" parameter
+ 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);
$inputs = [];
$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 (defaults($_REQUEST, 'canceled')) {
- goaway('contacts');
+ if (!empty($_REQUEST['canceled'])) {
+ $a->internalRedirect('contact');
}
self::dropContact($orig_record);
info(L10n::t('Contact has been removed.') . EOL);
- goaway('contacts');
+ $a->internalRedirect('contact');
return; // NOTREACHED
}
if ($cmd === 'posts') {
}
}
- $_SESSION['return_url'] = $a->query_string;
+ $_SESSION['return_path'] = $a->query_string;
- if ((defaults($a->data, 'contact')) && (is_array($a->data['contact']))) {
+ 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']));
$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];
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
- $search = defaults($_GET, 'search') ? notags(trim($_GET['search'])) : '';
- $nets = defaults($_GET, 'nets' ) ? notags(trim($_GET['nets'])) : '';
+ $search = Strings::escapeTags(trim(defaults($_GET, 'search', '')));
+ $nets = Strings::escapeTags(trim(defaults($_GET, 'nets' , '')));
$tabs = [
[
'id' => 'showhidden-tab',
'accesskey' => 'h',
],
+ [
+ 'label' => L10n::t('Groups'),
+ 'url' => 'group',
+ 'sel' => ($hidden) ? 'active' : '',
+ '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') ";
}
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,
+ $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
+ $o .= Renderer::replaceMacros($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,
'$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;
];
}
- $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;
}
}
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;
$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,
- 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
- 'url' => $url,
- 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
- 'nick' => htmlentities($rr['nick']),
+ 'sparkle' => $sparkle,
+ 'itemurl' => defaults($rr, 'addr', $rr['url']),
+ 'url' => $url,
+ 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+ 'nick' => $rr['nick'],
];
}
projects / friendica.git / blobdiff