Commit a5a5ac60 authored by Zot's avatar Zot

find unregistered z6 clones on hubzilla sites (does not happen automatically...

find unregistered z6 clones on hubzilla sites (does not happen automatically since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release.
parent 30f71ad6
...@@ -85,6 +85,7 @@ class Cron_daily { ...@@ -85,6 +85,7 @@ class Cron_daily {
Master::Summon(array('Cli_suggest')); Master::Summon(array('Cli_suggest'));
remove_obsolete_hublocs(); remove_obsolete_hublocs();
z6_discover();
call_hooks('cron_daily',datetime_convert()); call_hooks('cron_daily',datetime_convert());
......
...@@ -199,6 +199,7 @@ class Poller { ...@@ -199,6 +199,7 @@ class Poller {
set_config('system','lastpoll',datetime_convert()); set_config('system','lastpoll',datetime_convert());
//All done - clear the lockfile //All done - clear the lockfile
@unlink($lockfile); @unlink($lockfile);
return; return;
......
...@@ -305,3 +305,39 @@ function ping_site($url) { ...@@ -305,3 +305,39 @@ function ping_site($url) {
return $ret; return $ret;
} }
function z6_discover() {
// find unregistered zot6 clone hublocs
$c = q("select channel_hash, portable_id from channel where channel_deleted = 0");
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'",
dbesc($entry['channel_hash']),
dbesc(z_root())
);
if (! $q1) {
// channel has no zot clones
continue;
}
// 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($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) {
// probe and store results - only for zot6 (over-ride the zot default)
discover_by_webbie($entry['hubloc_addr'],'zot6');
}
}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment