aboutsummaryrefslogtreecommitdiffstats
path: root/include/onedirsync.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/onedirsync.php')
-rw-r--r--include/onedirsync.php23
1 files changed, 21 insertions, 2 deletions
diff --git a/include/onedirsync.php b/include/onedirsync.php
index b9c17628a..8ae1df5e5 100644
--- a/include/onedirsync.php
+++ b/include/onedirsync.php
@@ -12,7 +12,7 @@ function onedirsync_run($argv, $argc){
cli_startup();
$a = get_app();
- logger('onedirsync: start');
+ logger('onedirsync: start ' . intval($argv[1]));
if(($argc > 1) && (intval($argv[1])))
$update_id = intval($argv[1]);
@@ -28,9 +28,28 @@ function onedirsync_run($argv, $argc){
if(! $r)
return;
- if($r['ud_flags'] & UPDATE_FLAGS_UPDATED)
+ if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr']))
return;
+ // Have we probed this channel more recently than the other directory server
+ // (where we received this update from) ?
+ // If we have, we don't need to do anything except mark any older entries updated
+
+ $x = q("select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d ) order by ud_date desc limit 1",
+ dbesc($r[0]['ud_addr']),
+ dbesc($r[0]['ud_date']),
+ intval(UPDATE_FLAGS_UPDATED)
+ );
+ if($x) {
+ $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not ( ud_flags & %d ) and ud_date < '%s' ",
+ intval(UPDATE_FLAGS_UPDATED),
+ dbesc($r[0]['ud_addr']),
+ intval(UPDATE_FLAGS_UPDATED),
+ dbesc($x[0]['ud_date'])
+ );
+ return;
+ }
+
update_directory_entry($r[0]);
return;