diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-03-15 19:14:10 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-03-15 19:14:10 +0100 |
| commit | 9b64c6163cba7530ee09e47b44e62c3e8ecf69ef (patch) | |
| tree | e84880e412390f44e67aff1497562e633deed136 /include/text.php | |
| parent | 4fd0d1489825bd456e0cac77b47de156ff94c0cc (diff) | |
| parent | 3cb179aff19d803b91261e410c50b36e4bae1246 (diff) | |
| download | volse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.tar.gz volse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.tar.bz2 volse-hubzilla-9b64c6163cba7530ee09e47b44e62c3e8ecf69ef.zip | |
Merge pull request #2 from friendica/master
merge from friendica/red
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index dfd35c769..53b92c05f 100755 --- a/include/text.php +++ b/include/text.php @@ -656,6 +656,12 @@ function contact_block() { $o = ''; $a = get_app(); + if(! $a->profile['uid']) + return; + + if(! perm_is_allowed($a->profile['uid'],get_observer_hash(),'view_contacts')) + return; + $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); if($shown === false) @@ -665,8 +671,11 @@ function contact_block() { if((! is_array($a->profile)) || ($a->profile['hide_friends'])) return $o; - $r = q("SELECT COUNT(abook_id) AS total FROM abook WHERE abook_channel = %d and abook_flags = 0", - intval($a->profile['uid']) + $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)", + intval($a->profile['uid']), + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN), + intval(XCHAN_FLAGS_DELETED) ); if(count($r)) { $total = intval($r[0]['total']); @@ -677,8 +686,11 @@ 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 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 abook_flags = 0 and not (xchan_flags & %d ) and not (xchan_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($shown) ); |