diff options
| author | friendica <info@friendica.com> | 2014-04-14 17:29:19 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-14 17:29:19 -0700 |
| commit | 9026ea649a92b8f3e48a4940dd02c316c0a87c02 (patch) | |
| tree | 77fbbf6f983563c0a20537bf8b59cf8d6c88bc98 /include/text.php | |
| parent | dc9a06ed37b0507dd32de899684aae6f262d07ec (diff) | |
| download | volse-hubzilla-9026ea649a92b8f3e48a4940dd02c316c0a87c02.tar.gz volse-hubzilla-9026ea649a92b8f3e48a4940dd02c316c0a87c02.tar.bz2 volse-hubzilla-9026ea649a92b8f3e48a4940dd02c316c0a87c02.zip | |
better mapping of visible connections
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/text.php b/include/text.php index 63fb76422..68542005b 100755 --- a/include/text.php +++ b/include/text.php @@ -707,11 +707,10 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide_friends'])) return $o; - $r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_flags = 0 and not (xchan_flags & %d) and not (xchan_flags & %d) and not (xchan_flags & %d)", + $r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and not ( abook_flags & %d ) and not (xchan_flags & %d)", intval($a->profile['uid']), - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_ORPHAN), - intval(XCHAN_FLAGS_DELETED) + intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED) ); if(count($r)) { $total = intval($r[0]['total']); @@ -722,11 +721,10 @@ function contact_block() { } else { - $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND abook_flags = 0 and not (xchan_flags & %d ) and not (xchan_flags & %d ) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d", + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_ORPHAN), - intval(XCHAN_FLAGS_DELETED), + intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED), intval($shown) ); |