aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Daemon/Onedirsync.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-12-12 21:39:38 +0000
committerMario <mario@mariovavti.com>2020-12-12 22:41:38 +0100
commit634ace552d40f9f287a6419dd6fe5b19d3f390ca (patch)
tree6f28c1a243f186af7c7a6b90ea5afc1b65c515ac /Zotlabs/Daemon/Onedirsync.php
parent751a1ba969b4a48b40d42022ed342db7e4e00c03 (diff)
downloadvolse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.tar.gz
volse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.tar.bz2
volse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.zip
try to prevent hubloc confusion in some places
(cherry picked from commit 61cfeb5bdb749319357912d958cd13304b895bce)
Diffstat (limited to 'Zotlabs/Daemon/Onedirsync.php')
-rw-r--r--Zotlabs/Daemon/Onedirsync.php19
1 files changed, 12 insertions, 7 deletions
diff --git a/Zotlabs/Daemon/Onedirsync.php b/Zotlabs/Daemon/Onedirsync.php
index cc16c0b58..2ad76761d 100644
--- a/Zotlabs/Daemon/Onedirsync.php
+++ b/Zotlabs/Daemon/Onedirsync.php
@@ -2,6 +2,8 @@
namespace Zotlabs\Daemon;
+use Zotlabs\Lib\Libzot;
+
require_once('include/zot.php');
require_once('include/dir_fns.php');
@@ -11,7 +13,7 @@ class Onedirsync {
static public function run($argc,$argv) {
logger('onedirsync: start ' . intval($argv[1]));
-
+
if(($argc > 1) && (intval($argv[1])))
$update_id = intval($argv[1]);
@@ -19,7 +21,7 @@ class Onedirsync {
logger('onedirsync: no update');
return;
}
-
+
$r = q("select * from updates where ud_id = %d limit 1",
intval($update_id)
);
@@ -50,10 +52,13 @@ class Onedirsync {
// ignore doing an update if this ud_addr refers to a known dead hubloc
- $h = q("select * from hubloc where hubloc_addr = '%s' limit 1",
+ $h = q("select * from hubloc where hubloc_addr = '%s'",
dbesc($r[0]['ud_addr'])
);
- if(($h) && ($h[0]['hubloc_status'] & HUBLOC_OFFLINE)) {
+
+ $h = Libzot::zot_record_preferred($h);
+
+ if(($h) && ($h['hubloc_status'] & HUBLOC_OFFLINE)) {
$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
intval(UPDATE_FLAGS_UPDATED),
dbesc($r[0]['ud_addr']),
@@ -63,13 +68,13 @@ class Onedirsync {
return;
}
- // we might have to pull this out some day, but for now update_directory_entry()
+ // we might have to pull this out some day, but for now update_directory_entry()
// runs zot_finger() and is kind of zot specific
- if($h && $h[0]['hubloc_network'] !== 'zot')
+ if($h && ! in_array($h['hubloc_network'], ['zot6', 'zot']))
return;
- update_directory_entry($r[0]);
+ update_directory_entry($r[0]);
return;
}