Merge pull request #8912 from annando/subscribed-tags

[friendica.git] / src / Worker / CronJobs.php

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index b66358b0e820d140e5a8bd057f891d6843bf9603..319a369d1fa69a6953059bedb954b81afe8199b2 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -84,10 +84,6 @@ class CronJobs
                                self::clearCache($a);
                                break;
 
-                       case 'repair_diaspora':
-                               self::repairDiaspora($a);
-                               break;
-
                        case 'repair_database':
                                self::repairDatabase();
                                break;
@@ -132,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() "]);
@@ -144,6 +141,7 @@ class CronJobs
 
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
+               DBA::close($users);
        }
 
        /**
@@ -244,46 +242,6 @@ class CronJobs
                DI::config()->set('system', 'cache_last_cleared', time());
        }
 
-       /**
-        * 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 (!GServer::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"]));
-               }
-       }
-
        /**
         * Do some repairs in database entries
         *