$a->internalRedirect('contact');
}
- public static function post()
+ public static function post(array $parameters = [])
{
$a = self::getApp();
Hook::callAll('contact_edit_post', $_POST);
- $profile_id = intval(defaults($_POST, 'profile-assign', 0));
+ $profile_id = intval($_POST['profile-assign'] ?? 0);
if ($profile_id) {
if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
notice(L10n::t('Could not locate selected profile.') . EOL);
$notify = !empty($_POST['notify']);
- $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
+ $fetch_further_information = intval($_POST['fetch_further_information'] ?? 0);
- $ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
+ $ffi_keyword_blacklist = Strings::escapeHtml(trim($_POST['ffi_keyword_blacklist'] ?? ''));
- $priority = intval(defaults($_POST, 'poll', 0));
+ $priority = intval($_POST['poll'] ?? 0);
if ($priority > 5 || $priority < 0) {
$priority = 0;
}
- $info = Strings::escapeHtml(trim(defaults($_POST, 'info', '')));
+ $info = Strings::escapeHtml(trim($_POST['info'] ?? ''));
$r = DBA::update('contact', [
'profile-id' => $profile_id,
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['REQUET_URI']);
+ return Login::form($_SERVER['REQUEST_URI']);
}
$a = self::getApp();
- $nets = defaults($_GET, 'nets', '');
+ $nets = $_GET['nets'] ?? '';
+ $rel = $_GET['rel'] ?? '';
if (empty($a->page['aside'])) {
$a->page['aside'] = '';
$network_link = '';
}
+ $follow_link = '';
+ $unfollow_link = '';
+ if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+ if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::SHARING, Model\Contact::FRIEND])) {
+ $unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+ } elseif(!$contact['pending']) {
+ $follow_link = 'follow?url=' . urlencode($contact['url']);
+ }
+ }
+
+ $wallmessage_link = '';
+ if ($contact['uid'] && Model\Contact::canReceivePrivateMessages($contact)) {
+ $wallmessage_link = 'message/new/' . $contact['id'];
+ }
+
$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
'$name' => $contact['name'],
'$photo' => $contact['photo'],
'$url' => Model\Contact::magicLinkByContact($contact, $contact['url']),
- '$addr' => defaults($contact, 'addr', ''),
+ '$addr' => $contact['addr'] ?? '',
'$network_link' => $network_link,
'$network' => L10n::t('Network:'),
- '$account_type' => Model\Contact::getAccountType($contact)
+ '$account_type' => Model\Contact::getAccountType($contact),
+ '$follow' => L10n::t('Follow'),
+ '$follow_link' => $follow_link,
+ '$unfollow' => L10n::t('Unfollow'),
+ '$unfollow_link' => $unfollow_link,
+ '$wallmessage' => L10n::t('Message'),
+ '$wallmessage_link' => $wallmessage_link,
]);
$findpeople_widget = '';
$follow_widget = '';
$networks_widget = '';
+ $rel_widget = '';
} else {
$vcard_widget = '';
$findpeople_widget = Widget::findPeople();
}
$networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
+ $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
}
if ($contact['uid'] != 0) {
$groups_widget = null;
}
- $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget;
+ $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, [
$relation_text = '';
}
- if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+ if (!in_array($contact['network'], Protocol::FEDERATED)) {
$relation_text = '';
}
$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 ($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');
- }
- } 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_actions = self::getContactActions($contact);
'$updpub' => L10n::t('Update public posts'),
'$last_update' => $last_update,
'$udnow' => L10n::t('Update now'),
- '$follow' => $follow,
- '$follow_text' => $follow_text,
'$profile_select' => $profile_select,
'$contact_id' => $contact['id'],
'$block_text' => ($contact['blocked'] ? L10n::t('Unblock') : L10n::t('Block')),
}
// @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 = " AND `blocked`";
break;
case 'hidden':
- $sql_extra = " AND `hidden` = 1 AND `blocked` = 0";
+ $sql_extra = " AND `hidden` AND NOT `blocked`";
break;
case 'ignored':
- $sql_extra = " AND `readonly` = 1 AND `blocked` = 0";
+ $sql_extra = " AND `readonly` AND NOT `blocked`";
break;
case 'archived':
- $sql_extra = " AND `archive` = 1 AND `blocked` = 0";
+ $sql_extra = " AND `archive` AND NOT `blocked`";
+ 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' , '')));
+ $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
+ $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
+ $rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
$tabs = [
[
'id' => 'showall-tab',
'accesskey' => 'l',
],
+ [
+ 'label' => L10n::t('Pending'),
+ 'url' => 'contact/pending',
+ 'sel' => $type == 'pending' ? 'active' : '',
+ 'title' => L10n::t('Only show pending contacts'),
+ 'id' => 'showpending-tab',
+ 'accesskey' => 'p',
+ ],
[
'label' => L10n::t('Blocked'),
'url' => 'contact/blocked',
$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`
- WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
+ WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 ",
intval($_SESSION['uid'])
);
if (DBA::isResult($r)) {
$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 ",
+ $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($_SESSION['uid']),
$pager->getStart(),
$pager->getItemsPerPage()
}
}
+ switch ($rel) {
+ case 'followers': $header = L10n::t('Followers'); break;
+ case 'following': $header = L10n::t('Following'); break;
+ case 'mutuals': $header = L10n::t('Mutual friends'); break;
+ default: $header = L10n::t('Contacts');
+ }
+
switch ($type) {
+ case 'pending': $header .= ' - ' . L10n::t('Pending'); break;
case 'blocked': $header .= ' - ' . L10n::t('Blocked'); break;
case 'hidden': $header .= ' - ' . L10n::t('Hidden'); break;
case 'ignored': $header .= ' - ' . L10n::t('Ignored'); break;
'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'],
'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
- 'acl' => ACL::getFullSelectorHTML($a->user, true),
+ 'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
'bang' => '',
'visitor' => 'block',
'profile_uid' => local_user(),
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
- if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
- $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
- }
-
Model\Profile::load($a, '', 0, $profiledata, true);
$o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
}
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
- if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+ if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
$profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
}
$dir_icon = '';
$alt_text = '';
- switch ($rr['rel']) {
- case Model\Contact::FRIEND:
- $dir_icon = 'images/lrarrow.gif';
- $alt_text = L10n::t('Mutual Friendship');
- break;
+ if (!empty($rr['uid']) && !empty($rr['rel'])) {
+ switch ($rr['rel']) {
+ case Model\Contact::FRIEND:
+ $dir_icon = 'images/lrarrow.gif';
+ $alt_text = L10n::t('Mutual Friendship');
+ break;
- case Model\Contact::FOLLOWER;
- $dir_icon = 'images/larrow.gif';
- $alt_text = L10n::t('is a fan of yours');
- break;
+ case Model\Contact::FOLLOWER;
+ $dir_icon = 'images/larrow.gif';
+ $alt_text = L10n::t('is a fan of yours');
+ break;
- case Model\Contact::SHARING;
- $dir_icon = 'images/rarrow.gif';
- $alt_text = L10n::t('you are a fan of');
- break;
+ case Model\Contact::SHARING;
+ $dir_icon = 'images/rarrow.gif';
+ $alt_text = L10n::t('you are a fan of');
+ break;
- default:
- break;
+ default:
+ break;
+ }
}
$url = Model\Contact::magicLink($rr['url']);
$sparkle = '';
}
+ if ($rr['pending']) {
+ if (in_array($rr['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
+ $alt_text = L10n::t('Pending outgoing contact request');
+ } else {
+ $alt_text = L10n::t('Pending incoming contact request');
+ }
+ }
+
if ($rr['self']) {
$dir_icon = 'images/larrow.gif';
$alt_text = L10n::t('This is you');
'username' => $rr['name'],
'account_type' => Model\Contact::getAccountType($rr),
'sparkle' => $sparkle,
- 'itemurl' => defaults($rr, 'addr', $rr['url']),
+ 'itemurl' => ($rr['addr'] ?? '') ?: $rr['url'],
'url' => $url,
'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
'nick' => $rr['nick'],
projects / friendica.git / blobdiff