diff options
| author | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
|---|---|---|
| committer | Andrew Manning <andrew@reticu.li> | 2016-11-30 21:22:51 -0500 |
| commit | 3f838e1dbccab819ce0cf93b079afea8d41d2a7a (patch) | |
| tree | f76eb1fbb01cb3917474613c0f0bcfbe74ba0aa3 /Zotlabs/Zot | |
| parent | 50a8ba8c18b081ce60ba7ab1a74ba30d8ff43794 (diff) | |
| parent | c845eed114ec3cea90acd35c419110d9ab76051f (diff) | |
| download | volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.gz volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.tar.bz2 volse-hubzilla-3f838e1dbccab819ce0cf93b079afea8d41d2a7a.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'Zotlabs/Zot')
| -rw-r--r-- | Zotlabs/Zot/Auth.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php index 0837be21a..d4d3bee1d 100644 --- a/Zotlabs/Zot/Auth.php +++ b/Zotlabs/Zot/Auth.php @@ -149,9 +149,13 @@ class Auth { // The actual channel sending the packet ($c[0]) is not important, but this provides a // generic zot packet with a sender which can be verified + $x = q("select site_crypto from site where site_url = '%s' limit 1", + dbesc($hubloc['hubloc_url']) + ); + $p = zot_build_packet($channel,$type = 'auth_check', array(array('guid' => $hubloc['hubloc_guid'],'guid_sig' => $hubloc['hubloc_guid_sig'])), - $hubloc['hubloc_sitekey'], $this->sec); + $hubloc['hubloc_sitekey'], (($x) ? $x[0]['site_crypto'] : ''), $this->sec); $this->Debug('auth check packet created using sitekey ' . $hubloc['hubloc_sitekey']); $this->Debug('packet contents: ' . $p); |