aboutsummaryrefslogtreecommitdiffstats
path: root/include/hubloc.php
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-03-29 15:28:28 +0100
committerMax Kostikov <max@kostikov.co>2019-03-29 15:28:28 +0100
commit7d392e5adb495fc0cae927198a340fc9f6a4288a (patch)
tree8c2ab00e10b338beb87ec46f25fe0c3e9fa005ad /include/hubloc.php
parentb0c33308be48d9d90dddad470bd6434daad700a2 (diff)
parentf44cc2b60cd762eed759ce1a3e9bb47f06f80302 (diff)
downloadvolse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.tar.gz
volse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.tar.bz2
volse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.zip
Merge branch 'z6_discover_fixes' into 'dev'
fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575
Diffstat (limited to 'include/hubloc.php')
-rw-r--r--include/hubloc.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/hubloc.php b/include/hubloc.php
index 3fed46495..4a1f77733 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -311,7 +311,9 @@ function z6_discover() {
// find unregistered zot6 clone hublocs
- $c = q("select channel_hash, channel_portable_id from channel where channel_deleted = 0");
+ $c = q("select channel_hash, channel_portable_id from channel where channel_deleted = '%s'",
+ dbesc(NULL_DATE)
+ );
if ($c) {
foreach ($c as $entry) {
$q1 = 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'",
@@ -325,16 +327,16 @@ 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) {
continue;
}
// zot6 hubloc not found.
- if(strpos($entry['site_project'],'hubzilla') !== false && version_compare($entry['site_version'],'4.0') >= 0) {
+ if(strpos($q['site_project'],'hubzilla') !== false && version_compare($q['site_version'],'4.0') >= 0) {
// probe and store results - only for zot6 (over-ride the zot default)
- discover_by_webbie($entry['hubloc_addr'],'zot6');
+ discover_by_webbie($q['hubloc_addr'],'zot6');
}
}
}