diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-17 14:51:57 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-17 14:51:57 -0700 |
| commit | 0754da58da96316a9ff4505f9c7c712c1f0094b6 (patch) | |
| tree | 4547950121b0ade42878ce9a4d5b7cb5430bf02d /Zotlabs/Module/Fhublocs.php | |
| parent | 31df7af61f449d2fe307b3440c7dd7bf4b016cf0 (diff) | |
| download | volse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.tar.gz volse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.tar.bz2 volse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.zip | |
some changes merged from wrong branch... new function channel_reddress() instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file
Diffstat (limited to 'Zotlabs/Module/Fhublocs.php')
| -rw-r--r-- | Zotlabs/Module/Fhublocs.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Fhublocs.php b/Zotlabs/Module/Fhublocs.php index f5b439421..cdf323a41 100644 --- a/Zotlabs/Module/Fhublocs.php +++ b/Zotlabs/Module/Fhublocs.php @@ -42,7 +42,7 @@ class Fhublocs extends \Zotlabs\Web\Controller { if($y) $primary_address = $y[0]['xchan_addr']; - $hub_address = $rr['channel']['channel_address'] . '@' . \App::get_hostname(); + $hub_address = channel_reddress($rr['channel']); $primary = (($hub_address === $primary_address) ? 1 : 0); @@ -61,7 +61,7 @@ class Fhublocs extends \Zotlabs\Web\Controller { dbesc($rr['channel_guid']), dbesc($rr['channel_guid_sig']), dbesc($rr['channel_hash']), - dbesc($rr['channel_address'] . '@' . \App::get_hostname()), + dbesc(channel_reddress($rr)), intval($primary), dbesc(z_root()), dbesc(base64url_encode(rsa_sign(z_root(),$rr['channel_prvkey']))), |