Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index 1c47c949928179f032e53bd6c07ac118ce12492e..9ab56ff43551661595d3ad3327958e7df528a654 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -120,8 +120,8 @@ function cron_update_photo_albums() {
 function cron_expire_and_remove_users() {
        // expire any expired accounts
        q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
-               AND `account_expires_on` != '0000-00-00 00:00:00'
-               AND `account_expires_on` < UTC_TIMESTAMP() ");
+               AND `account_expires_on` > '%s'
+               AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
 
        // delete user and contact records for recently removed accounts
        $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@@ -214,11 +214,13 @@ function cron_poll_contacts($argc, $argv) {
 
                        $xml = false;
 
-                       if ($manual_id)
-                               $contact['last-update'] = '0000-00-00 00:00:00';
+                       if ($manual_id) {
+                               $contact['last-update'] = NULL_DATE;
+                       }
 
-                       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
+                       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
                                $contact['priority'] = 2;
+                       }
 
                        if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
                                // We should be getting everything via a hub. But just to be sure, let's check once a day.