diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-07 18:52:18 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-07 18:52:18 -0700 |
| commit | 1fbb1e6c2a665159d0085217c9b73d571e360256 (patch) | |
| tree | 3a6d075cdfbca0f7fb15b989ee7b6fb191f3bb67 /Zotlabs | |
| parent | 7e9162ef06b4719723941679e55af079421ae475 (diff) | |
| download | volse-hubzilla-1fbb1e6c2a665159d0085217c9b73d571e360256.tar.gz volse-hubzilla-1fbb1e6c2a665159d0085217c9b73d571e360256.tar.bz2 volse-hubzilla-1fbb1e6c2a665159d0085217c9b73d571e360256.zip | |
initial testing success with owa
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Owa.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Zot/Verify.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index f71099599..0b625dbe5 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -33,7 +33,7 @@ logger('verified: ' . print_r($verified,true)); if($verified && $verified['header_signed'] && $verified['header_valid']) { $token = random_string(32); - \Zotlabs\Zot\Verify::create('owt',0,token,$r[0]['hubloc_hash']); + \Zotlabs\Zot\Verify::create('owt',0,$token,$r[0]['hubloc_addr']); $x = json_encode([ 'success' => true, 'token' => $token ]); header('Content-Type: application/x-zot+json'); echo $x; diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index dab7d9e01..348171bdc 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -123,7 +123,7 @@ class Finger { $x = json_decode($result['body'], true); $verify = \Zotlabs\Web\HTTPSig::verify($result,(($x) ? $x['key'] : '')); - + if($x && (! $verify['header_valid'])) { $signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null); if($signed_token) { diff --git a/Zotlabs/Zot/Verify.php b/Zotlabs/Zot/Verify.php index 1f1288aa0..1d9e6de3f 100644 --- a/Zotlabs/Zot/Verify.php +++ b/Zotlabs/Zot/Verify.php @@ -33,7 +33,7 @@ class Verify { function get_meta($type,$channel_id,$token) { - $r = q("select id from verify where vtype = '%s' and channel = %d and token = '%s' limit 1", + $r = q("select id, meta from verify where vtype = '%s' and channel = %d and token = '%s' limit 1", dbesc($type), intval($channel_id), dbesc($token) |