diff options
| author | Mario <mario@mariovavti.com> | 2021-01-13 09:39:55 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-13 09:39:55 +0000 |
| commit | f4b9291d420a0f6e47beca784d0e5246a73214a6 (patch) | |
| tree | 09ff688045897f17abbae1b366c47de2ee863e75 | |
| parent | 08f717d4fc27ff763c7f0380b5f24065ba62abd5 (diff) | |
| parent | b7afc905ecc5b738c7696b662692f727099cb968 (diff) | |
| download | volse-hubzilla-f4b9291d420a0f6e47beca784d0e5246a73214a6.tar.gz volse-hubzilla-f4b9291d420a0f6e47beca784d0e5246a73214a6.tar.bz2 volse-hubzilla-f4b9291d420a0f6e47beca784d0e5246a73214a6.zip | |
Merge branch 'dev' into 5.2RC
| -rw-r--r-- | Zotlabs/Module/Getfile.php | 7 | ||||
| -rw-r--r-- | include/import.php | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php index a867f5ff7..20cc23ac0 100644 --- a/Zotlabs/Module/Getfile.php +++ b/Zotlabs/Module/Getfile.php @@ -54,10 +54,9 @@ class Getfile extends \Zotlabs\Web\Controller { $keyId = $sigblock['keyId']; if($keyId) { - $r = q("SELECT * FROM hubloc LEFT JOIN xchan ON hubloc_hash = xchan_hash - WHERE hubloc_addr = '%s' OR hubloc_id_url = '%s'", - dbesc(str_replace('acct:','',$keyId)), - dbesc($keyId) + $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash + where hubloc_id_url = '%s'", + dbesc(str_replace('acct:','',$keyId)) ); if($r) { $hubloc = Libzot::zot_record_preferred($r); diff --git a/include/import.php b/include/import.php index 82d6cfe07..b512e1f11 100644 --- a/include/import.php +++ b/include/import.php @@ -1358,7 +1358,7 @@ function sync_files($channel, $files) { $headers = []; $headers['Accept'] = 'application/x-zot+json' ; $headers['Sigtoken'] = random_string(); - $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_reddress($channel), true, 'sha512'); + $headers = HTTPSig::create_sig($headers, $channel['channel_prvkey'], channel_url($channel), true, 'sha512'); $x = z_post_url($fetch_url,$parr,$redirects,[ 'filep' => $fp, 'headers' => $headers]); fclose($fp); |