diff options
| author | marijus <mario@mariovavti.com> | 2014-05-09 07:39:27 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-05-09 07:39:27 +0200 |
| commit | 56eb9e75ccad49c8fcbd569b097c2ea85e7d258f (patch) | |
| tree | 87411ce648195b34f0a02ed49d60b007a6a8470d /include | |
| parent | 6e397240a3f1a1bb52ef5d9bd3929a6770ac8222 (diff) | |
| parent | 831b18cf283cd52fd1b01d6c6c4648b8351985a7 (diff) | |
| download | volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.tar.gz volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.tar.bz2 volse-hubzilla-56eb9e75ccad49c8fcbd569b097c2ea85e7d258f.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include')
| -rwxr-xr-x | include/text.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index b36e550f9..0e136fe8e 100755 --- a/include/text.php +++ b/include/text.php @@ -705,12 +705,22 @@ function contact_block() { if($shown == 0) return; + + $is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false); + + $abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF; + $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED; + if(! $is_owner) { + $abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN; + $xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN; + } + 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 not ( abook_flags & %d ) and not (xchan_flags & %d)", intval($a->profile['uid']), - intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF), - intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED) + intval($abook_flags), + intval($xchan_flags) ); if(count($r)) { $total = intval($r[0]['total']); @@ -723,8 +733,8 @@ function contact_block() { $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(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF), - intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED), + intval($abook_flags), + intval($xchan_flags), intval($shown) ); |