diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-14 21:28:17 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-14 21:28:17 -0700 |
| commit | 397a23499dc64e2abdd2c27ccdf7e059a23dcfff (patch) | |
| tree | e195aad36a5674cd7dc7709c6fa517af3561f519 /Zotlabs/Module/Acl.php | |
| parent | d660bde3244055a456a506ca05b080a9c8fc9074 (diff) | |
| download | volse-hubzilla-397a23499dc64e2abdd2c27ccdf7e059a23dcfff.tar.gz volse-hubzilla-397a23499dc64e2abdd2c27ccdf7e059a23dcfff.tar.bz2 volse-hubzilla-397a23499dc64e2abdd2c27ccdf7e059a23dcfff.zip | |
make the xchan_hash for the access token location independent
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index c8a4fdd7c..15609c3c8 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -137,15 +137,17 @@ class Acl extends \Zotlabs\Web\Controller { intval(local_channel()) ); if($r1) { + require_once('include/security.php'); $r2 = array(); foreach($r1 as $rr) { + $x = atoken_xchan($rr); $r2[] = [ 'id' => 'a' . $rr['atoken_id'] , - 'hash' => $rr['atoken_uid'] . '.' . $rr['atoken_name'], - 'name' => $rr['atoken_name'], - 'micro' => get_default_profile_photo(48), + 'hash' => $x['xchan_hash'], + 'name' => $x['xchan_name'], + 'micro' => $x['xchan_photo_m'], 'url' => z_root(), - 'nick' => t('guest:') . $rr['atoken_name'], + 'nick' => $x['xchan_addr'], 'abook_their_perms' => 0, 'abook_flags' => 0, 'abook_self' => 0 |