diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-17 23:54:40 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-17 23:54:40 -0700 |
| commit | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (patch) | |
| tree | 7537d0e2266b912fd0c96014e32f992431fd19c0 /Zotlabs/Module | |
| parent | d37e6b9271662ce65633b625438552e9d03fbef7 (diff) | |
| download | volse-hubzilla-4d3b0577c9538644ca0eeb2751b285521d2cc86d.tar.gz volse-hubzilla-4d3b0577c9538644ca0eeb2751b285521d2cc86d.tar.bz2 volse-hubzilla-4d3b0577c9538644ca0eeb2751b285521d2cc86d.zip | |
acl issue with some ActivityPub completions
Diffstat (limited to 'Zotlabs/Module')
| -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", |