bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8161 from MrPetovan/task/8160-contact-group-filter

Browse source 
Add group membership filter widget in contact list
This commit is contained in:
Philipp 2020-01-24 00:54:34 +01:00 committed by GitHub
parent 9475383c4f 4da90b9378
commit 2af07bcd84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 137 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Content/Widget.php
View file

@ -13,6 +13,7 @@ use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -82,7 +83,7 @@ class Widget
public static function unavailableNetworks() public static function unavailableNetworks()
{ {
// Always hide content from these networks // Always hide content from these networks
$networks = ['face', 'apdn']; $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET];
if (!Addon::isEnabled("discourse")) { if (!Addon::isEnabled("discourse")) {
$networks[] = Protocol::DISCOURSE; $networks[] = Protocol::DISCOURSE;
@ -175,7 +176,39 @@ class Widget
} }
/** /**
* Return networks widget * Return group membership widget
*
* @param string $baseurl
* @param string $selected
* @return string
* @throws \Exception
*/
public static function groups($baseurl, $selected = '')
{
if (!local_user()) {
return '';
}
$options = array_map(function ($group) {
return [
'ref' => $group['id'],
'name' => $group['name']
];
}, Group::getByUserId(local_user()));
return self::filter(
'group',
DI::l10n()->t('Groups'),
'',
DI::l10n()->t('Everyone'),
$baseurl,
$options,
$selected
);
}
/**
* Return contact relationship widget
* *
* @param string $baseurl baseurl * @param string $baseurl baseurl
* @param string $selected optional, default empty * @param string $selected optional, default empty

175
src/Module/Contact.php
View file

@ -245,8 +245,10 @@ class Contact extends BaseModule
$a = DI::app(); $a = DI::app();
$nets = $_GET['nets'] ?? ''; $search = Strings::escapeTags(trim($_GET['search'] ?? ''));
$rel = $_GET['rel'] ?? ''; $nets = Strings::escapeTags(trim($_GET['nets'] ?? ''));
$rel = Strings::escapeTags(trim($_GET['rel'] ?? ''));
$group = Strings::escapeTags(trim($_GET['group'] ?? ''));
if (empty(DI::page()['aside'])) { if (empty(DI::page()['aside'])) {
DI::page()['aside'] = ''; DI::page()['aside'] = '';
@ -324,6 +326,12 @@ class Contact extends BaseModule
$follow_widget = ''; $follow_widget = '';
$networks_widget = ''; $networks_widget = '';
$rel_widget = ''; $rel_widget = '';
if ($contact['uid'] != 0) {
$groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
} else {
$groups_widget = '';
}
} else { } else {
$vcard_widget = ''; $vcard_widget = '';
$findpeople_widget = Widget::findPeople(); $findpeople_widget = Widget::findPeople();
@ -335,12 +343,7 @@ class Contact extends BaseModule
$networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets); $networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets);
$rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel); $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel);
} $groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group);
if ($contact['uid'] != 0) {
$groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id);
} else {
$groups_widget = null;
} }
DI::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;
@ -350,7 +353,6 @@ class Contact extends BaseModule
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
]); ]);
$sort_type = 0;
$o = ''; $o = '';
Nav::setSelected('contact'); Nav::setSelected('contact');
@ -643,39 +645,116 @@ class Contact extends BaseModule
return $arr['output']; return $arr['output'];
} }
$select_uid = local_user(); $sql_values = [local_user()];
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
$type = $a->argv[1] ?? ''; $type = $a->argv[1] ?? '';
switch ($type) { switch ($type) {
case 'blocked': case 'blocked':
$sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`blocked`)", intval(local_user())); $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`blocked`)";
$select_uid = 0; // This makes the query look for contact.uid = 0
array_unshift($sql_values, 0);
break; break;
case 'hidden': case 'hidden':
$sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`"; $sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
break; break;
case 'ignored': case 'ignored':
$sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`ignored`)", intval(local_user())); $sql_extra = " AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = ? and `user-contact`.`ignored`)";
$select_uid = 0; // This makes the query look for contact.uid = 0
array_unshift($sql_values, 0);
break; break;
case 'archived': case 'archived':
$sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`"; $sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
break; break;
case 'pending': case 'pending':
$sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d) $sql_extra = " AND `pending` AND NOT `archive` AND ((`rel` = ?)
OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))", Model\Contact::SHARING); OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))";
$sql_values[] = Model\Contact::SHARING;
break; break;
default: default:
$sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`"; $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
break;
} }
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); $searching = false;
$search_hdr = null;
if ($search) {
$searching = true;
$search_hdr = $search;
$search_txt = preg_quote($search);
$sql_extra .= " AND (name REGEXP ? OR url REGEXP ? OR nick REGEXP ?)";
$sql_values[] = $search_txt;
$sql_values[] = $search_txt;
$sql_values[] = $search_txt;
}
$search = Strings::escapeTags(trim($_GET['search'] ?? '')); if ($nets) {
$nets = Strings::escapeTags(trim($_GET['nets'] ?? '')); $sql_extra .= " AND network = ? ";
$rel = Strings::escapeTags(trim($_GET['rel'] ?? '')); $sql_values[] = $nets;
}
switch ($rel) {
case 'followers':
$sql_extra .= " AND `rel` IN (?, ?)";
$sql_values[] = Model\Contact::FOLLOWER;
$sql_values[] = Model\Contact::FRIEND;
break;
case 'following':
$sql_extra .= " AND `rel` IN (?, ?)";
$sql_values[] = Model\Contact::SHARING;
$sql_values[] = Model\Contact::FRIEND;
break;
case 'mutuals':
$sql_extra .= " AND `rel` = ?";
$sql_values[] = Model\Contact::FRIEND;
break;
}
if ($group) {
$sql_extra = " AND EXISTS(SELECT `id` FROM `group_member` WHERE `gid` = ? AND `contact`.`id` = `contact-id`)";
$sql_values[] = $group;
}
$sql_extra .= Widget::unavailableNetworks();
$total = 0;
$stmt = DBA::p("SELECT COUNT(*) AS `total`
FROM `contact`
WHERE `uid` = ?
AND `self` = 0
AND NOT `deleted`
$sql_extra",
$sql_values
);
if (DBA::isResult($stmt)) {
$total = DBA::fetch($stmt)['total'];
}
DBA::close($stmt);
$pager = new Pager(DI::args()->getQueryString());
$sql_values[] = $pager->getStart();
$sql_values[] = $pager->getItemsPerPage();
$contacts = [];
$stmt = DBA::p("SELECT *
FROM `contact`
WHERE `uid` = ?
AND `self` = 0
AND NOT `deleted`
$sql_extra
ORDER BY `name` ASC
LIMIT ?, ?",
$sql_values
);
while ($contact = DBA::fetch($stmt)) {
$contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
$contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
$contacts[] = self::getContactTemplateVars($contact);
}
DBA::close($stmt);
$tabs = [ $tabs = [
[ [
@ -736,58 +815,8 @@ class Contact extends BaseModule
], ],
]; ];
$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); $tabs_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
$t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); $tabs_html = Renderer::replaceMacros($tabs_tpl, ['$tabs' => $tabs]);
$total = 0;
$searching = false;
$search_hdr = null;
if ($search) {
$searching = true;
$search_hdr = $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') ";
}
if ($nets) {
$sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
}
switch ($rel) {
case 'followers': $sql_extra .= " AND `rel` IN (1, 3)"; break;
case 'following': $sql_extra .= " AND `rel` IN (2, 3)"; break;
case 'mutuals': $sql_extra .= " AND `rel` = 3"; break;
}
$sql_extra .= " AND NOT `deleted` ";
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
$sql_extra3 = Widget::unavailableNetworks();
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `self` = 0 $sql_extra $sql_extra2 $sql_extra3",
intval($select_uid)
);
if (DBA::isResult($r)) {
$total = $r[0]['total'];
}
$pager = new Pager(DI::args()->getQueryString());
$contacts = [];
$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()
);
if (DBA::isResult($r)) {
foreach ($r as $rr) {
$rr['blocked'] = Model\Contact::isBlockedByUser($rr['id'], local_user());
$rr['readonly'] = Model\Contact::isIgnoredByUser($rr['id'], local_user());
$contacts[] = self::getContactTemplateVars($rr);
}
}
switch ($rel) { switch ($rel) {
case 'followers': $header = DI::l10n()->t('Followers'); break; case 'followers': $header = DI::l10n()->t('Followers'); break;
@ -809,7 +838,7 @@ class Contact extends BaseModule
$tpl = Renderer::getMarkupTemplate('contacts-template.tpl'); $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
$o .= Renderer::replaceMacros($tpl, [ $o .= Renderer::replaceMacros($tpl, [
'$header' => $header, '$header' => $header,
'$tabs' => $t, '$tabs' => $tabs_html,
'$total' => $total, '$total' => $total,
'$search' => $search_hdr, '$search' => $search_hdr,
'$desc' => DI::l10n()->t('Search your contacts'), '$desc' => DI::l10n()->t('Search your contacts'),