diff options
| author | zottel <github@zottel.net> | 2012-04-28 02:30:20 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-28 02:30:20 +0200 |
| commit | 43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (patch) | |
| tree | f23edf82793ede551df581a36f8bc2370770c092 /mod/acl.php | |
| parent | edc7e571b710d0ce24587c529d6e51ee7781d638 (diff) | |
| parent | c3f70a9e56151b8594b3485cc8b12e4d26ac6773 (diff) | |
| download | volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.gz volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.bz2 volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/acl.php')
| -rw-r--r-- | mod/acl.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/acl.php b/mod/acl.php index c23ee1a67..88f150d7a 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -33,7 +33,7 @@ function acl_init(&$a){ if ($type=='' || $type=='c'){ $r = q("SELECT COUNT(`id`) AS c FROM `contact` WHERE `uid` = %d AND `self` = 0 - AND `blocked` = 0 AND `pending` = 0 + AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra2" , intval(local_user()) ); @@ -45,7 +45,7 @@ function acl_init(&$a){ $r = q("SELECT COUNT(`id`) AS c FROM `contact` WHERE `uid` = %d AND `self` = 0 - AND `blocked` = 0 AND `pending` = 0 + AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `network` IN ('%s','%s','%s') $sql_extra2" , intval(local_user()), dbesc(NETWORK_DFRN), @@ -94,7 +94,7 @@ function acl_init(&$a){ if ($type=='' || $type=='c'){ $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra2 ORDER BY `name` ASC ", intval(local_user()) @@ -102,7 +102,7 @@ function acl_init(&$a){ } elseif($type == 'm') { $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `network` IN ('%s','%s','%s') $sql_extra2 ORDER BY `name` ASC ", |