friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7911 from annando/acl 

ACL: Contact list is now sorted, forums reappeared
This commit is contained in:
Hypolite Petovan 2019-12-06 04:11:36 -05:00 committed by GitHub
parent 03e2b04e8f b1fa0e8e26
commit f8569ac3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/ACL.php
View File

@ -258,10 +258,20 @@ class ACL extends BaseObject
*/ */
public static function getContactListByUserId(int $user_id) public static function getContactListByUserId(int $user_id)
{ {
$acl_contacts = Contact::selectToArray( $fields = ['id', 'name', 'addr', 'micro'];
['id', 'name', 'addr', 'micro'], $params = ['order' => ['name']];
['uid' => $user_id, 'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]] $acl_contacts = Contact::selectToArray($fields,
['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]], $params
); );
$acl_forums = Contact::selectToArray($fields,
['uid' => $user_id, 'self' => false, 'blocked' => false, 'archive' => false, 'deleted' => false,
'pending' => false, 'contact-type' => Contact::TYPE_COMMUNITY], $params
);
$acl_contacts = array_merge($acl_forums, $acl_contacts);
array_walk($acl_contacts, function (&$value) { array_walk($acl_contacts, function (&$value) {
$value['type'] = 'contact'; $value['type'] = 'contact';
}); });