X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCronJobs.php;h=8b9d3b9bcf27879f4766952506a02db995b4297c;hb=d993c8584c4c2b6023606e727ea3e0db6a6bde51;hp=9e130d9ef0933d66245b62405f96508e1a863ffb;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 9e130d9ef0..8b9d3b9bcf 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -1,35 +1,30 @@
 <?php
-
 /**
  * @file src/worker/CronJobs.php
  */
-
 namespace Friendica\Worker;
 
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Database\PostUpdate;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Photo;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/post_update.php';
 require_once 'mod/nodeinfo.php';
 
 class CronJobs
 {
 	public static function execute($command = '')
 	{
-		global $a;
-
-		require_once 'include/datetime.php';
-		require_once 'include/post_update.php';
-		require_once 'mod/nodeinfo.php';
+		$a = \Friendica\BaseObject::getApp();
 
 		// No parameter set? So return
 		if ($command == '') {
@@ -39,9 +34,10 @@ class CronJobs
 		logger("Starting cronjob " . $command, LOGGER_DEBUG);
 
 		// Call possible post update functions
-		// see include/post_update.php for more details
+		// see src/Database/PostUpdate.php for more details
 		if ($command == 'post_update') {
-			post_update();
+// Post updates will be reenabled (hopefully in a few days) when most item works are done
+//			PostUpdate::update();
 			return;
 		}
 
@@ -58,7 +54,7 @@ class CronJobs
 		}
 
 		if ($command == 'update_contact_birthdays') {
-			update_contact_birthdays();
+			Contact::updateBirthdays();
 			return;
 		}
 
@@ -110,17 +106,20 @@ class CronJobs
 	 */
 	private static function expireAndRemoveUsers()
 	{
-		// expire any expired accounts
-		q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
-			AND `account_expires_on` > '%s'
-			AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
+		// expire any expired regular accounts. Don't expire forums.
+		$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", NULL_DATE];
+		dba::update('user', ['account_expired' => true], $condition);
+
+		// Remove any freshly expired account
+		$users = dba::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
+		while ($user = dba::fetch($users)) {
+			User::remove($user['uid']);
+		}
 
 		// delete user records for recently removed accounts
-		$r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-		if (DBM::is_result($r)) {
-			foreach ($r as $user) {
-				dba::delete('user', ['uid' => $user['uid']]);
-			}
+		$users = dba::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
+		while ($user = dba::fetch($users)) {
+			dba::delete('user', ['uid' => $user['uid']]);
 		}
 	}