From 5221f38db79490847b62e58861639fed63a0ce53 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 21 Jun 2015 01:37:09 +0200 Subject: [PATCH] ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them. --- include/acl_selectors.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index b2c4b31c81..c1e62ac36b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -399,6 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') { $search = $_REQUEST['query']; } + logger("Searching for ".$search." - type ".$type, LOGGER_DEBUG); if ($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` 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 ORDER BY `name` ASC ", - intval(local_user()) + intval(local_user()), + dbesc(NETWORK_OSTATUS), dbesc(NETWORK_STATUSNET) ); } elseif($type == 'm') { -- 2.39.5