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 /include/security.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 'include/security.php')
| -rw-r--r-- | include/security.php | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/include/security.php b/include/security.php index c2515a6e1..e345636e7 100644 --- a/include/security.php +++ b/include/security.php @@ -100,18 +100,21 @@ function atoken_login($atoken) { function atoken_xchan($atoken) { - return [ - 'xchan_hash' => $atoken['atoken_uid'] . '.' . $atoken['atoken_name'], - 'xchan_name' => $atoken['atoken_name'], - 'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(), - 'xchan_network' => 'unknown', - 'xchan_hidden' => 1, - 'xchan_photo_mimetype' => 'image/jpeg', - 'xchan_photo_l' => get_default_profile_photo(300), - 'xchan_photo_m' => get_default_profile_photo(80), - 'xchan_photo_s' => get_default_profile_photo(48) - - ]; + $c = channelx_by_n($atoken['atoken_uid']); + if($c) { + return [ + 'xchan_hash' => substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'], + 'xchan_name' => $atoken['atoken_name'], + 'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(), + 'xchan_network' => 'unknown', + 'xchan_hidden' => 1, + 'xchan_photo_mimetype' => 'image/jpeg', + 'xchan_photo_l' => get_default_profile_photo(300), + 'xchan_photo_m' => get_default_profile_photo(80), + 'xchan_photo_s' => get_default_profile_photo(48) + + ]; + } } |