aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-03-28 15:51:24 +0100
committerMario Vavti <mario@mariovavti.com>2019-03-28 15:51:24 +0100
commit31680898e3f36e3fcc44ba797ae99d3234b5fc7b (patch)
treefb006ca8305d22cbc0d4f9ccc1341be149897f1d
parentb10b8ca3f46fca78ee69d89c49fa671096f72caa (diff)
downloadvolse-hubzilla-31680898e3f36e3fcc44ba797ae99d3234b5fc7b.tar.gz
volse-hubzilla-31680898e3f36e3fcc44ba797ae99d3234b5fc7b.tar.bz2
volse-hubzilla-31680898e3f36e3fcc44ba797ae99d3234b5fc7b.zip
another fix for z6_discover() and create a zot6 hubloc if applicable
-rw-r--r--Zotlabs/Module/Import.php34
-rw-r--r--include/hubloc.php2
2 files changed, 34 insertions, 2 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 9d047ed7b..cd7267db3 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -228,13 +228,45 @@ class Import extends \Zotlabs\Web\Controller {
);
// reset the original primary hubloc if it is being seized
-
if($seize) {
$r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
dbesc($channel['channel_hash']),
dbesc(z_root())
);
}
+
+ // create a new zot6 hubloc if we have got a channel_portable_id
+ if($channel['channel_portable_id']) {
+ $r = hubloc_store_lowlevel(
+ [
+ 'hubloc_guid' => $channel['channel_guid'],
+ 'hubloc_guid_sig' => 'sha256.' . $channel['channel_guid_sig'],
+ 'hubloc_hash' => $channel['channel_portable_id'],
+ 'hubloc_addr' => channel_reddress($channel),
+ 'hubloc_network' => 'zot6',
+ 'hubloc_primary' => (($seize) ? 1 : 0),
+ 'hubloc_url' => z_root(),
+ 'hubloc_url_sig' => 'sha256.' . base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])),
+ 'hubloc_host' => \App::get_hostname(),
+ 'hubloc_callback' => z_root() . '/zot',
+ 'hubloc_sitekey' => get_config('system','pubkey'),
+ 'hubloc_updated' => datetime_convert(),
+ 'hubloc_id_url' => channel_url($channel),
+ 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(),get_config('system','pubkey'));
+
+ ]
+ );
+
+ // reset the original primary hubloc if it is being seized
+ if($seize) {
+ $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
+ dbesc($channel['channel_portable_id']),
+ dbesc(z_root())
+ );
+ }
+
+ }
+
}
logger('import step 5');
diff --git a/include/hubloc.php b/include/hubloc.php
index eb91e4f90..4a1f77733 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -327,7 +327,7 @@ function z6_discover() {
// does this particular server have a zot6 clone registered on our site for this channel?
foreach ($q1 as $q) {
$q2 = q("select * from hubloc left join site on hubloc_url = site_url where hubloc_deleted = 0 and site_dead = 0 and hubloc_hash = '%s' and hubloc_url = '%s'",
- dbesc($entry['portable_id']),
+ dbesc($entry['channel_portable_id']),
dbesc($q['hubloc_url'])
);
if ($q2) {