clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them.

This commit is contained in:
Michael Vogel 2015-06-21 01:37:09 +02:00
parent 8229737d2d
commit 5221f38db7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/acl_selectors.php
View File

@ -399,6 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') {
$search = $_REQUEST['query']; $search = $_REQUEST['query'];
} }
logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG);
if ($search!=""){ if ($search!=""){
$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
@ -496,9 +497,11 @@ function acl_lookup(&$a, $out_type = 'json') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, forum FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != ''
AND NOT (`network` IN ('%s', '%s'))
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",
intval(local_user()) intval(local_user()),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_STATUSNET)
); );
} }
elseif($type == 'm') { elseif($type == 'm') {