diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-30 10:42:51 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-30 10:42:51 +0100 |
| commit | b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d (patch) | |
| tree | 10cbc640f84ffabe70494822aa19096610fe5ded /Zotlabs/Module/Magic.php | |
| parent | 1f47f4ff9644523f14898ecd6f55d0fd0438d253 (diff) | |
| parent | 4fef29e61c32b129f0090a4962d91607337a9406 (diff) | |
| download | volse-hubzilla-b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d.tar.gz volse-hubzilla-b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d.tar.bz2 volse-hubzilla-b28ff509b1f7c95ac723fb1b2a20929da2ba7d3d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Magic.php')
| -rw-r--r-- | Zotlabs/Module/Magic.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 879085f96..9ad9c951c 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -146,10 +146,17 @@ class Magic extends \Zotlabs\Web\Controller { if($x['success']) { $j = json_decode($x['body'],true); - if($j['success'] && $j['token']) { - $x = strpbrk($dest,'?&'); - $args = (($x) ? '&owt=' . $j['token'] : '?f=&owt=' . $j['token']) . (($delegate) ? '&delegate=1' : ''); + if($j['success']) { + $token = ''; + if($j['encrypted_token']) { + openssl_private_decrypt(base64url_decode($j['encrypted_token']),$token,$channel['channel_prvkey']); + } + else { + $token = $j['token']; + } + $x = strpbrk($dest,'?&'); + $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); goaway($dest . $args); } } |