diff options
| author | Mario <mario@mariovavti.com> | 2020-05-15 10:10:07 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-05-15 10:10:07 +0000 |
| commit | 81338e80865caff4c911980c0cb9689cb10c7087 (patch) | |
| tree | 0322b978dbbf67bfc5480d0d0f9b1757afaddc38 | |
| parent | 4270e17bc4ffedd35ddc5e00f7037162e9b95725 (diff) | |
| download | volse-hubzilla-81338e80865caff4c911980c0cb9689cb10c7087.tar.gz volse-hubzilla-81338e80865caff4c911980c0cb9689cb10c7087.tar.bz2 volse-hubzilla-81338e80865caff4c911980c0cb9689cb10c7087.zip | |
use zot_record_preferred() when fetching keys
| -rw-r--r-- | Zotlabs/Lib/JSalmon.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 25 |
2 files changed, 17 insertions, 10 deletions
diff --git a/Zotlabs/Lib/JSalmon.php b/Zotlabs/Lib/JSalmon.php index bed748432..67512046f 100644 --- a/Zotlabs/Lib/JSalmon.php +++ b/Zotlabs/Lib/JSalmon.php @@ -69,4 +69,4 @@ class JSalmon { } -}
\ No newline at end of file +} diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 3d050fd9b..827e0d779 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -243,13 +243,15 @@ class HTTPSig { $url = ((strpos($id,'#')) ? substr($id,0,strpos($id,'#')) : $id); - $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' limit 1", + $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s'", dbesc(str_replace('acct:','',$url)), dbesc($url) ); - if($x && $x[0]['xchan_pubkey']) { - return [ 'portable_id' => $x[0]['xchan_hash'], 'public_key' => $x[0]['xchan_pubkey'] , 'hubloc' => $x[0] ]; + $x = Libzot::zot_record_preferred($x); + + if($x && $x['xchan_pubkey']) { + return [ 'portable_id' => $x['xchan_hash'], 'public_key' => $x['xchan_pubkey'] , 'hubloc' => $x ]; } $r = ActivityStreams::fetch($id); @@ -268,13 +270,15 @@ class HTTPSig { function get_webfinger_key($id) { - $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' limit 1", + $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s'", dbesc(str_replace('acct:','',$id)), dbesc($id) ); - if($x && $x[0]['xchan_pubkey']) { - return [ 'portable_id' => $x[0]['xchan_hash'], 'public_key' => $x[0]['xchan_pubkey'] , 'hubloc' => $x[0] ]; + $x = Libzot::zot_record_preferred($x); + + if($x && $x['xchan_pubkey']) { + return [ 'portable_id' => $x['xchan_hash'], 'public_key' => $x['xchan_pubkey'] , 'hubloc' => $x ]; } $wf = Webfinger::exec($id); @@ -302,12 +306,15 @@ class HTTPSig { function get_zotfinger_key($id) { - $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' limit 1", + $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s'", dbesc(str_replace('acct:','',$id)), dbesc($id) ); - if($x && $x[0]['xchan_pubkey']) { - return [ 'portable_id' => $x[0]['xchan_hash'], 'public_key' => $x[0]['xchan_pubkey'] , 'hubloc' => $x[0] ]; + + $x = Libzot::zot_record_preferred($x); + + if($x && $x['xchan_pubkey']) { + return [ 'portable_id' => $x['xchan_hash'], 'public_key' => $x['xchan_pubkey'] , 'hubloc' => $x ]; } $wf = Webfinger::exec($id); |