X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCronJobs.php;h=319a369d1fa69a6953059bedb954b81afe8199b2;hb=a98957eeb29cfb142dfc4cd3e03c5bdfbc373466;hp=ba489717478ada36c7452fc3ad12913e3381a0ab;hpb=64e74b4e0386c0661f432491d4d72abb60e88932;p=friendica.git

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index ba48971747..319a369d1f 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -1,26 +1,40 @@
 <?php
 /**
- * @file src/worker/CronJobs.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\StorageManager;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\PostUpdate;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\GServer;
 use Friendica\Model\Nodeinfo;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -29,7 +43,7 @@ class CronJobs
 {
 	public static function execute($command = '')
 	{
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		// No parameter set? So return
 		if ($command == '') {
@@ -47,7 +61,7 @@ class CronJobs
 				Logger::info('cron_start');
 				Nodeinfo::update();
 				// Now trying to register
-				$url = 'http://the-federation.info/register/' . $a->getHostName();
+				$url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname();
 				Logger::debug('Check registering url', ['url' => $url]);
 				$ret = Network::fetchUrl($url);
 				Logger::debug('Check registering answer', ['answer' => $ret]);
@@ -70,10 +84,6 @@ class CronJobs
 				self::clearCache($a);
 				break;
 
-			case 'repair_diaspora':
-				self::repairDiaspora($a);
-				break;
-
 			case 'repair_database':
 				self::repairDatabase();
 				break;
@@ -90,7 +100,7 @@ class CronJobs
 	}
 
 	/**
-	 * @brief Update the cached values for the number of photo albums per user
+	 * Update the cached values for the number of photo albums per user
 	 */
 	private static function updatePhotoAlbums()
 	{
@@ -105,7 +115,7 @@ class CronJobs
 	}
 
 	/**
-	 * @brief Expire and remove user entries
+	 * Expire and remove user entries
 	 */
 	private static function expireAndRemoveUsers()
 	{
@@ -118,6 +128,7 @@ class CronJobs
 		while ($user = DBA::fetch($users)) {
 			User::remove($user['uid']);
 		}
+		DBA::close($users);
 
 		// delete user records for recently removed accounts
 		$users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]);
@@ -130,17 +141,18 @@ class CronJobs
 
 			DBA::delete('user', ['uid' => $user['uid']]);
 		}
+		DBA::close($users);
 	}
 
 	/**
-	 * @brief Clear cache entries
+	 * Clear cache entries
 	 *
 	 * @param App $a
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function clearCache(App $a)
 	{
-		$last = Config::get('system', 'cache_last_cleared');
+		$last = DI::config()->get('system', 'cache_last_cleared');
 
 		if ($last) {
 			$next = $last + (3600); // Once per hour
@@ -154,7 +166,7 @@ class CronJobs
 		}
 
 		// clear old cache
-		Cache::clear();
+		DI::cache()->clear();
 
 		// clear old item cache files
 		clear_cache();
@@ -166,10 +178,10 @@ class CronJobs
 		clear_cache($a->getBasePath() . "/view/smarty3/compiled", $a->getBasePath() . "/view/smarty3/compiled");
 
 		// clear cache for image proxy
-		if (!Config::get("system", "proxy_disabled")) {
+		if (!DI::config()->get("system", "proxy_disabled")) {
 			clear_cache($a->getBasePath(), $a->getBasePath() . "/proxy");
 
-			$cachetime = Config::get('system', 'proxy_cache_time');
+			$cachetime = DI::config()->get('system', 'proxy_cache_time');
 
 			if (!$cachetime) {
 				$cachetime = ProxyUtils::DEFAULT_TIME;
@@ -186,13 +198,13 @@ class CronJobs
 		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(DI::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(DI::config()->get('system', 'optimize_fragmentation')) / 100;
 			if ($fragmentation_level == 0) {
 				$fragmentation_level = 0.3; // Default value is 30%
 			}
@@ -227,51 +239,11 @@ class CronJobs
 			}
 		}
 
-		Config::set('system', 'cache_last_cleared', time());
-	}
-
-	/**
-	 * @brief Repair missing values in Diaspora contacts
-	 *
-	 * @param App $a
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-	 * @throws \ImagickException
-	 */
-	private static function repairDiaspora(App $a)
-	{
-		$starttime = time();
-
-		$r = q("SELECT `id`, `url` FROM `contact`
-			WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
-				ORDER BY RAND() LIMIT 50", DBA::escape(Protocol::DIASPORA));
-		if (!DBA::isResult($r)) {
-			return;
-		}
-
-		foreach ($r as $contact) {
-			// Quit the loop after 3 minutes
-			if (time() > ($starttime + 180)) {
-				return;
-			}
-
-			if (!PortableContact::reachable($contact["url"])) {
-				continue;
-			}
-
-			$data = Probe::uri($contact["url"]);
-			if ($data["network"] != Protocol::DIASPORA) {
-				continue;
-			}
-
-			Logger::log("Repair contact " . $contact["id"] . " " . $contact["url"], Logger::DEBUG);
-			q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d",
-				DBA::escape($data["batch"]), DBA::escape($data["notify"]), DBA::escape($data["poll"]), DBA::escape($data["pubkey"]),
-				intval($contact["id"]));
-		}
+		DI::config()->set('system', 'cache_last_cleared', time());
 	}
 
 	/**
-	 * @brief Do some repairs in database entries
+	 * Do some repairs in database entries
 	 *
 	 */
 	private static function repairDatabase()
@@ -304,8 +276,11 @@ class CronJobs
 		/// - set contact-id in item when not present
 
 		// Add intro entries for pending contacts
+		// We don't do this for DFRN entries since such revived contact requests seem to mostly fail.
 		$pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
-			WHERE `pending` AND `rel` IN (?, ?) AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0, Contact::FOLLOWER);
+			WHERE `pending` AND `rel` IN (?, ?) AND `network` != ?
+				AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)",
+			0, Contact::FOLLOWER, Protocol::DFRN);
 		while ($contact = DBA::fetch($pending_contacts)) {
 			DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
 				'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);
@@ -321,8 +296,8 @@ class CronJobs
 	 */
 	private static function moveStorage()
 	{
-		$current = StorageManager::getBackend();
-		$moved = StorageManager::move($current);
+		$current = DI::storage();
+		$moved = DI::storageManager()->move($current);
 
 		if ($moved) {
 			Worker::add(PRIORITY_LOW, "CronJobs", "move_storage");