diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-26 02:42:48 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-26 02:42:48 -0700 |
| commit | f32ba0656430929ba5af3d1ef730d7ada98c0ea7 (patch) | |
| tree | 60343c71432d62bd3f50f0b9a4f3a04107157189 /Zotlabs | |
| parent | 4a60f4522068470d2249818e62f1c0c6496ca3d7 (diff) | |
| download | volse-hubzilla-f32ba0656430929ba5af3d1ef730d7ada98c0ea7.tar.gz volse-hubzilla-f32ba0656430929ba5af3d1ef730d7ada98c0ea7.tar.bz2 volse-hubzilla-f32ba0656430929ba5af3d1ef730d7ada98c0ea7.zip | |
work through a few more autocomplete minor nits
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 92e7d176d..2678aeb7a 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -337,22 +337,21 @@ class Acl extends \Zotlabs\Web\Controller { if($r) { foreach($r as $g) { - if(($g['network'] === 'rss') && ($type != 'a')) + if(in_array($g['network'],['rss','anon','unknown']) && ($type != 'a')) continue; $g['hash'] = urlencode($g['hash']); if(! $g['nick']) { - $t = explode(' ',strtolower($g['name'])); - $g['nick'] = $t[0] . '@'; + $g['nick'] = $g['url']; } - if(in_array($g['hash'],$permitted) && in_array($type, [ 'c', 'f' ]) && (! $noforums)) { + if(in_array($g['hash'],$permitted) && $type === 'f' && (! $noforums)) { $contacts[] = array( "type" => "c", "photo" => "images/twopeople.png", - "name" => $g['name'] . (($type === 'f') ? '' : '+'), - "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'), + "name" => $g['name'], + "id" => urlencode($g['id']), "xid" => $g['hash'], "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), @@ -369,7 +368,7 @@ class Acl extends \Zotlabs\Web\Controller { "id" => urlencode($g['id']), "xid" => $g['hash'], "link" => (($g['nick']) ? $g['nick'] : $g['url']), - "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), + "nick" => ((strpos($g['nick'],'@')) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => '', "label" => '', |