X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FCronJobs.php;h=ab4c4c62111a4af105aab95c7dc97ae856132814;hb=bd21fc3751c76bc62893cd6e8e69f949f9e0d475;hp=cbfa86ed88773e9b15e0ca6328a4a3970d3655f9;hpb=a21f6135fcd8f0bfdb49de38a5ab4954d1784503;p=friendica.git

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index cbfa86ed88..ab4c4c6211 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -2,39 +2,43 @@
 /**
  * @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\Model\GlobalContact;
+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;
 
-class CronJobs {
-	public static function execute($command = ''){
+require_once 'include/dba.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';
-		require_once 'include/photos.php';
-		require_once 'include/user.php';
 
 		// No parameter set? So return
 		if ($command == '') {
 			return;
 		}
 
-		logger("Starting cronjob ".$command, LOGGER_DEBUG);
+		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();
+			PostUpdate::update();
 			return;
 		}
 
@@ -51,7 +55,7 @@ class CronJobs {
 		}
 
 		if ($command == 'update_contact_birthdays') {
-			update_contact_birthdays();
+			Contact::updateBirthdays();
 			return;
 		}
 
@@ -78,7 +82,7 @@ class CronJobs {
 			return;
 		}
 
-		logger("Xronjob ".$command." is unknown.", LOGGER_DEBUG);
+		logger("Xronjob " . $command . " is unknown.", LOGGER_DEBUG);
 
 		return;
 	}
@@ -86,32 +90,37 @@ class CronJobs {
 	/**
 	 * @brief Update the cached values for the number of photo albums per user
 	 */
-	private static function updatePhotoAlbums() {
+	private static function updatePhotoAlbums()
+	{
 		$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
 		if (!DBM::is_result($r)) {
 			return;
 		}
 
-		foreach ($r AS $user) {
-			photo_albums($user['uid'], true);
+		foreach ($r as $user) {
+			Photo::clearAlbumCache($user['uid']);
 		}
 	}
 
 	/**
 	 * @brief Expire and remove user entries
 	 */
-	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));
+	private static function expireAndRemoveUsers()
+	{
+		// 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', array('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']]);
 		}
 	}
 
@@ -120,9 +129,9 @@ class CronJobs {
 	 *
 	 * @param App $a
 	 */
-	private static function clearCache(App $a) {
-
-		$last = Config::get('system','cache_last_cleared');
+	private static function clearCache(App $a)
+	{
+		$last = Config::get('system', 'cache_last_cleared');
 
 		if ($last) {
 			$next = $last + (3600); // Once per hour
@@ -142,37 +151,37 @@ class CronJobs {
 		clear_cache();
 
 		// clear cache for photos
-		clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+		clear_cache($a->get_basepath(), $a->get_basepath() . "/photo");
 
 		// clear smarty cache
-		clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+		clear_cache($a->get_basepath() . "/view/smarty3/compiled", $a->get_basepath() . "/view/smarty3/compiled");
 
 		// clear cache for image proxy
 		if (!Config::get("system", "proxy_disabled")) {
-			clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+			clear_cache($a->get_basepath(), $a->get_basepath() . "/proxy");
 
-			$cachetime = Config::get('system','proxy_cache_time');
+			$cachetime = Config::get('system', 'proxy_cache_time');
 			if (!$cachetime) {
 				$cachetime = PROXY_DEFAULT_TIME;
 			}
-			$condition = array('`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime);
+			$condition = ['`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime];
 			dba::delete('photo', $condition);
 		}
 
 		// Delete the cached OEmbed entries that are older than three month
-		dba::delete('oembed', array("`created` < NOW() - INTERVAL 3 MONTH"));
+		dba::delete('oembed', ["`created` < NOW() - INTERVAL 3 MONTH"]);
 
 		// Delete the cached "parse_url" entries that are older than three month
-		dba::delete('parsed_url', array("`created` < NOW() - INTERVAL 3 MONTH"));
+		dba::delete('parsed_url', ["`created` < NOW() - INTERVAL 3 MONTH"]);
 
 		// Maximum table size in megabyte
-		$max_tablesize = intval(Config::get('system','optimize_max_tablesize')) * 1000000;
+		$max_tablesize = intval(Config::get('system', 'optimize_max_tablesize')) * 1000000;
 		if ($max_tablesize == 0) {
 			$max_tablesize = 100 * 1000000; // Default are 100 MB
 		}
 		if ($max_tablesize > 0) {
 			// Minimum fragmentation level in percent
-			$fragmentation_level = intval(Config::get('system','optimize_fragmentation')) / 100;
+			$fragmentation_level = intval(Config::get('system', 'optimize_fragmentation')) / 100;
 			if ($fragmentation_level == 0) {
 				$fragmentation_level = 0.3; // Default value is 30%
 			}
@@ -194,7 +203,7 @@ class CronJobs {
 				// Calculate fragmentation
 				$fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]);
 
-				logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG);
+				logger("Table " . $table["Name"] . " - Fragmentation level: " . round($fragmentation * 100, 2), LOGGER_DEBUG);
 
 				// Don't optimize tables that needn't to be optimized
 				if ($fragmentation < $fragmentation_level) {
@@ -202,12 +211,12 @@ class CronJobs {
 				}
 
 				// So optimize it
-				logger("Optimize Table ".$table["Name"], LOGGER_DEBUG);
+				logger("Optimize Table " . $table["Name"], LOGGER_DEBUG);
 				q("OPTIMIZE TABLE `%s`", dbesc($table["Name"]));
 			}
 		}
 
-		Config::set('system','cache_last_cleared', time());
+		Config::set('system', 'cache_last_cleared', time());
 	}
 
 	/**
@@ -215,8 +224,8 @@ class CronJobs {
 	 *
 	 * @param App $a
 	 */
-	private static function repairDiaspora(App $a) {
-
+	private static function repairDiaspora(App $a)
+	{
 		$starttime = time();
 
 		$r = q("SELECT `id`, `url` FROM `contact`
@@ -241,7 +250,7 @@ class CronJobs {
 				continue;
 			}
 
-			logger("Repair contact ".$contact["id"]." ".$contact["url"], LOGGER_DEBUG);
+			logger("Repair contact " . $contact["id"] . " " . $contact["url"], LOGGER_DEBUG);
 			q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d",
 				dbesc($data["batch"]), dbesc($data["notify"]), dbesc($data["poll"]), dbesc($data["pubkey"]),
 				intval($contact["id"]));
@@ -252,15 +261,15 @@ class CronJobs {
 	 * @brief Do some repairs in database entries
 	 *
 	 */
-	private static function repairDatabase() {
-
+	private static function repairDatabase()
+	{
 		// Sometimes there seem to be issues where the "self" contact vanishes.
 		// We haven't found the origin of the problem by now.
 		$r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
 		if (DBM::is_result($r)) {
 			foreach ($r AS $user) {
-				logger('Create missing self contact for user '.$user['uid']);
-				user_create_self_contact($user['uid']);
+				logger('Create missing self contact for user ' . $user['uid']);
+				Contact::createSelfFromUserId($user['uid']);
 			}
 		}
 
@@ -275,7 +284,7 @@ class CronJobs {
 		$r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
 		if (DBM::is_result($r)) {
 			foreach ($r AS $user) {
-				GlobalContact::updateForUser($user["uid"]);
+				GContact::updateForUser($user["uid"]);
 			}
 		}