aboutsummaryrefslogtreecommitdiffstats
path: root/mod/acl.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-20 15:27:26 -0700
committerredmatrix <git@macgirvin.com>2016-03-20 15:27:26 -0700
commiteb68b66c58fb0fb0511827a51d39ef0b6aff6d33 (patch)
treebedd4fbee58d8f13a6ab11b52a62f34de7370df6 /mod/acl.php
parent77094f8d2bffa70c9e95518b9883f8752304102c (diff)
downloadvolse-hubzilla-eb68b66c58fb0fb0511827a51d39ef0b6aff6d33.tar.gz
volse-hubzilla-eb68b66c58fb0fb0511827a51d39ef0b6aff6d33.tar.bz2
volse-hubzilla-eb68b66c58fb0fb0511827a51d39ef0b6aff6d33.zip
issue #330 - permit archived connections in ACLs. If they are to be blocked for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition.
Diffstat (limited to 'mod/acl.php')
-rw-r--r--mod/acl.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/acl.php b/mod/acl.php
index aaf056b60..d3e006e87 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -94,7 +94,7 @@ function acl_init(&$a){
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+ WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
intval(local_channel())
);
@@ -118,7 +118,7 @@ function acl_init(&$a){
$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
+ WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
if($r2)
$r = array_merge($r,$r2);