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 /mod/viewconnections.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 'mod/viewconnections.php')
| -rw-r--r-- | mod/viewconnections.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mod/viewconnections.php b/mod/viewconnections.php index a9fb967f7..f5e7ab213 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -29,21 +29,19 @@ function viewconnections_content(&$a) { } - $r = q("SELECT count(*) 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(*) 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($r) { $a->set_pager_total($r[0]['total']); } - $r = q("SELECT * 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 ) order by xchan_name LIMIT %d , %d ", + $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not ( abook_flags & %d ) and not ( xchan_flags & %d ) order by xchan_name LIMIT %d , %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($a->pager['start']), intval($a->pager['itemspage']) ); |