harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
two compatibility issues zot/zot6

See merge request hubzilla/core!1553
This commit is contained in:
Mario 2019-03-14 09:38:46 +01:00
commit 8769fa0156
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Daemon/Cron_daily.php
View File

@ -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());

1
Zotlabs/Daemon/Poller.php
View File

@ -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;

36
include/hubloc.php
View File

@ -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');
}
}
}
}
}

4
include/items.php
View File

@ -763,11 +763,11 @@ function get_item_elements($x,$allow_code = false) {
// check the supplied signature against the supplied content. // check the supplied signature against the supplied content.
// Note that we will purify the content which could change it. // Note that we will purify the content which could change it.
$r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1", $r = q("select xchan_pubkey, xchan_network from xchan where xchan_hash = '%s' limit 1",
dbesc($arr['author_xchan']) dbesc($arr['author_xchan'])
); );
if($r) { if($r) {
if($r[0]['xchan_pubkey']) { if($r[0]['xchan_pubkey'] && $r[0]['xchan_network'] === 'zot') {
if(rsa_verify($x['body'],base64url_decode($arr['sig']),$r[0]['xchan_pubkey'])) { if(rsa_verify($x['body'],base64url_decode($arr['sig']),$r[0]['xchan_pubkey'])) {
$arr['item_verified'] = 1; $arr['item_verified'] = 1;
} }