X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCronJobs.php;h=6a8d65464d90378ea180aa3625906e2fb7d19264;hb=016cfcd84648d8634537822627e370a98005b9ff;hp=72d194808350d61df506137f8629e97b2165b2ba;hpb=dfa01f9265313d83b3db27f3a5d6b8a350163aa0;p=friendica.git

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 72d1948083..6a8d65464d 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
@@ -14,23 +13,23 @@ 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;
-
-require_once 'mod/nodeinfo.php';
+use Friendica\Util\Strings;
 
 class CronJobs
 {
 	public static function execute($command = '')
 	{
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		// No parameter set? So return
 		if ($command == '') {
@@ -48,7 +47,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]);
@@ -255,7 +254,7 @@ class CronJobs
 				return;
 			}
 
-			if (!PortableContact::reachable($contact["url"])) {
+			if (!GServer::reachable($contact["url"])) {
 				continue;
 			}
 
@@ -303,6 +302,18 @@ class CronJobs
 		/// - remove sign entries without item
 		/// - remove children when parent got lost
 		/// - 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 `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']]);
+		}
+		DBA::close($pending_contacts);
 	}
 
 	/**
@@ -313,8 +324,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");