diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
| commit | 51e40add661219c26c73f4b8d6da1f691e0b9b6d (patch) | |
| tree | 6ce7fcce4ead9110c67eecd08be652b07350ccb5 /Zotlabs/Module/Acl.php | |
| parent | 8123a62302330cc8629d0c8ecb68d3d3be07a005 (diff) | |
| parent | 4500faf463e7fd6fcf9948666421c941a1292df9 (diff) | |
| download | volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.gz volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.bz2 volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 9b2be0fea..769b36ce4 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -21,7 +21,7 @@ class Acl extends \Zotlabs\Web\Controller { function init() { - // logger('mod_acl: ' . print_r($_REQUEST,true)); + logger('mod_acl: ' . print_r($_REQUEST,true)); $start = (x($_REQUEST,'start') ? $_REQUEST['start'] : 0); $count = (x($_REQUEST,'count') ? $_REQUEST['count'] : 500); @@ -307,7 +307,7 @@ class Acl extends \Zotlabs\Web\Controller { $contacts[] = array( "photo" => $g['photo'], "name" => $g['name'], - "nick" => $g['address'], + "nick" => $g['address'] ); } } @@ -330,7 +330,12 @@ class Acl extends \Zotlabs\Web\Controller { continue; $g['hash'] = urlencode($g['hash']); - + + if(! $g['nick']) { + $t = explode(' ',strtolower($g['name'])); + $g['nick'] = $t[0] . '@'; + } + if(in_array($g['hash'],$permitted) && $type == 'c' && (! $noforums)) { $contacts[] = array( "type" => "c", |