aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-21 20:59:30 -0800
committerzotlabs <mike@macgirvin.com>2018-02-21 20:59:30 -0800
commit2d69b419ff9a0b2186d9479447f75f37b9102fa6 (patch)
treeef13efbd53a86466be7192883578b6f33512f882
parentfef3155e6ac04dcbc5b414b8dbc252267282dd47 (diff)
downloadvolse-hubzilla-2d69b419ff9a0b2186d9479447f75f37b9102fa6.tar.gz
volse-hubzilla-2d69b419ff9a0b2186d9479447f75f37b9102fa6.tar.bz2
volse-hubzilla-2d69b419ff9a0b2186d9479447f75f37b9102fa6.zip
move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org
-rw-r--r--Zotlabs/Lib/Verify.php (renamed from Zotlabs/Zot/Verify.php)2
-rw-r--r--Zotlabs/Module/Magic.php2
-rw-r--r--Zotlabs/Module/Owa.php2
-rw-r--r--include/zid.php4
-rw-r--r--include/zot.php4
5 files changed, 7 insertions, 7 deletions
diff --git a/Zotlabs/Zot/Verify.php b/Zotlabs/Lib/Verify.php
index 7abe38d17..8703e29e6 100644
--- a/Zotlabs/Zot/Verify.php
+++ b/Zotlabs/Lib/Verify.php
@@ -1,6 +1,6 @@
<?php
-namespace Zotlabs\Zot;
+namespace Zotlabs\Lib;
class Verify {
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);
diff --git a/include/zid.php b/include/zid.php
index b3a7d1e6a..67c1d9f6c 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -265,9 +265,9 @@ function red_zrlify_img_callback($matches) {
*/
function owt_init($token) {
- \Zotlabs\Zot\Verify::purge('owt', '3 MINUTE');
+ \Zotlabs\Lib\Verify::purge('owt', '3 MINUTE');
- $ob_hash = \Zotlabs\Zot\Verify::get_meta('owt', 0, $token);
+ $ob_hash = \Zotlabs\Lib\Verify::get_meta('owt', 0, $token);
if($ob_hash === false) {
return;
diff --git a/include/zot.php b/include/zot.php
index d28e584a1..7ecd77c82 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -4913,7 +4913,7 @@ function zot_reply_auth_check($data,$encrypted_packet) {
* the web server. We should probably convert this to webserver time rather than DB time so
* that the different clocks won't affect it and allow us to keep the time short.
*/
- Zotlabs\Zot\Verify::purge('auth', '30 MINUTE');
+ Zotlabs\Lib\Verify::purge('auth', '30 MINUTE');
$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
dbesc($sender_hash)
@@ -4954,7 +4954,7 @@ function zot_reply_auth_check($data,$encrypted_packet) {
// This additionally checks for forged sites since we already stored the expected result in meta
// and we've already verified that this is them via zot_gethub() and that their key signed our token
- $z = Zotlabs\Zot\Verify::match('auth',$c[0]['channel_id'],$data['secret'],$data['sender']['url']);
+ $z = Zotlabs\Lib\Verify::match('auth',$c[0]['channel_id'],$data['secret'],$data['sender']['url']);
if (! $z) {
logger('mod_zot: auth_check: verification key not found.');
$ret['message'] .= 'verification key not found' . EOL;