diff options
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Externals.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 613c2e705..924667b05 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -43,14 +43,14 @@ class Cron { // expire any expired mail - q("delete from mail where expires != '%s' and expires < %s ", + q("delete from mail where expires > '%s' and expires < %s ", dbesc(NULL_DATE), db_utcnow() ); // expire any expired items - $r = q("select id from item where expires != '%s' and expires < %s + $r = q("select id from item where expires > '%s' and expires < %s and item_deleted = 0 ", dbesc(NULL_DATE), db_utcnow() @@ -64,7 +64,7 @@ class Cron { // delete expired access tokens - $r = q("select atoken_id from atoken where atoken_expires != '%s' and atoken_expires < %s", + $r = q("select atoken_id from atoken where atoken_expires > '%s' and atoken_expires < %s", dbesc(NULL_DATE), db_utcnow() ); diff --git a/Zotlabs/Daemon/Externals.php b/Zotlabs/Daemon/Externals.php index 24cfe64ec..a9988a509 100644 --- a/Zotlabs/Daemon/Externals.php +++ b/Zotlabs/Daemon/Externals.php @@ -58,7 +58,7 @@ class Externals { } if($url) { - if($r[0]['site_pull'] !== NULL_DATE) + if($r[0]['site_pull'] > NULL_DATE) $mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day')); else { $days = get_config('externals','since_days'); diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index bebf8bf17..33b244dc5 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -54,7 +54,7 @@ class Onepoll { logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); - $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] === NULL_DATE)) + $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE)) ? datetime_convert('UTC','UTC','now - 7 days') : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index 75efbf8f7..e4bc9c143 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -117,7 +117,7 @@ class Poller { // if we've never connected with them, start the mark for death countdown from now - if($c == NULL_DATE) { + if($c <= NULL_DATE) { $r = q("update abook set abook_connected = '%s' where abook_id = %d", dbesc(datetime_convert()), intval($contact['abook_id']) @@ -171,7 +171,7 @@ class Poller { } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ", + $r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last <= '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ", intval(UPDATE_FLAGS_UPDATED), dbesc(NULL_DATE), db_utcnow(), db_quoteinterval('7 DAY') @@ -182,7 +182,7 @@ class Poller { // If they didn't respond when we attempted before, back off to once a day // After 7 days we won't bother anymore - if($rr['ud_last'] != NULL_DATE) + if($rr['ud_last'] > NULL_DATE) if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day')) continue; Master::Summon(array('Onedirsync',$rr['ud_id'])); |