diff options
| author | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
| commit | 65d98af24c3c7b784f7e2c95998df65901011ce3 (patch) | |
| tree | d7d6a60698d7a0c3704ea55cb71c543285186b17 /Zotlabs/Lib/Libsync.php | |
| parent | a57739c462a7991bf2130e8eca0c383eb276f0cd (diff) | |
| parent | 62d35627f35537d0056482047e74a27ad837c3cf (diff) | |
| download | volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.gz volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.tar.bz2 volse-hubzilla-65d98af24c3c7b784f7e2c95998df65901011ce3.zip | |
Merge branch '8.4RC'8.4
Diffstat (limited to 'Zotlabs/Lib/Libsync.php')
| -rw-r--r-- | Zotlabs/Lib/Libsync.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index d52b501e4..0d383c697 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -141,7 +141,7 @@ class Libsync { $total = count($synchubs); foreach ($synchubs as $hub) { - $hash = random_string(); + $hash = new_uuid(); $n = Libzot::build_packet($channel, 'sync', $env_recips, json_encode($info), 'hz', $hub['hubloc_sitekey'], $hub['site_crypto']); Queue::insert([ 'hash' => $hash, @@ -771,7 +771,12 @@ class Libsync { static function sync_locations($sender, $arr) { - $ret = []; + $ret = [ + 'change_message' => '', + 'changed' => false, + 'message' => '' + ]; + $what = ''; $changed = false; @@ -786,7 +791,7 @@ class Libsync { if (isset($arr['locations']) && $arr['locations']) { - $xisting = q("select * from hubloc where hubloc_hash = '%s'", + $xisting = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", dbesc($sender['hash']) ); |