diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-22 10:11:18 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-22 10:11:18 +0100 |
| commit | a1f9d40d08de8cf126a7a519c6f040c4df5ed00c (patch) | |
| tree | 10b2ca3ff65caf9425b85449b58615fdaf7ef443 /Zotlabs/Module | |
| parent | bdcee4fc30d3be9c8e986a75f3f05ce2cddca1fd (diff) | |
| parent | bb2ec5d8dc93ba81a3c156d647639eea131af5a3 (diff) | |
| download | volse-hubzilla-a1f9d40d08de8cf126a7a519c6f040c4df5ed00c.tar.gz volse-hubzilla-a1f9d40d08de8cf126a7a519c6f040c4df5ed00c.tar.bz2 volse-hubzilla-a1f9d40d08de8cf126a7a519c6f040c4df5ed00c.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Magic.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Owa.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 9ad9c951c..15e5cedcf 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -166,7 +166,7 @@ class Magic extends \Zotlabs\Web\Controller { $token = random_string(); - \Zotlabs\Zot\Verify::create('auth',$channel['channel_id'],$token,$x[0]['hubloc_url']); + \Zotlabs\Lib\Verify::create('auth',$channel['channel_id'],$token,$x[0]['hubloc_url']); $target_url = $x[0]['hubloc_callback'] . '/?f=&auth=' . urlencode(channel_reddress($channel)) . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION; diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 23ee14f39..e62fc9592 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -42,7 +42,7 @@ class Owa extends \Zotlabs\Web\Controller { logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); $ret['success'] = true; $token = random_string(32); - \Zotlabs\Zot\Verify::create('owt',0,$token,$hubloc['hubloc_addr']); + \Zotlabs\Lib\Verify::create('owt',0,$token,$hubloc['hubloc_addr']); $result = ''; openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); $ret['encrypted_token'] = base64url_encode($result); |