Merge pull request #5862 from nupplaphil/rename_App_Methods

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

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index ca898f2b6285a3fb4dfd8776d1354059c0384a8d..bd34449729392f575ad53169dc1750cb590ce5ad 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -8,13 +8,16 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+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 Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 require_once 'mod/nodeinfo.php';
@@ -35,8 +38,7 @@ class CronJobs
                // Call possible post update functions
                // see src/Database/PostUpdate.php for more details
                if ($command == 'post_update') {
-// Post updates will be reenabled (hopefully in a few days) when most item works are done
-//                     PostUpdate::update();
+                       PostUpdate::update();
                        return;
                }
 
@@ -118,6 +120,12 @@ class CronJobs
                // delete user records for recently removed accounts
                $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
                while ($user = DBA::fetch($users)) {
+                       // Delete the contacts of this user
+                       $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
+                       if (DBA::isResult($self)) {
+                               DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
+                       }
+
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
        }
@@ -149,19 +157,21 @@ class CronJobs
                clear_cache();
 
                // clear cache for photos
-               clear_cache($a->get_basepath(), $a->get_basepath() . "/photo");
+               clear_cache($a->getBasePath(), $a->getBasePath() . "/photo");
 
                // clear smarty cache
-               clear_cache($a->get_basepath() . "/view/smarty3/compiled", $a->get_basepath() . "/view/smarty3/compiled");
+               clear_cache($a->getBasePath() . "/view/smarty3/compiled", $a->getBasePath() . "/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->getBasePath(), $a->getBasePath() . "/proxy");
 
                        $cachetime = Config::get('system', 'proxy_cache_time');
+
                        if (!$cachetime) {
-                               $cachetime = PROXY_DEFAULT_TIME;
+                               $cachetime = ProxyUtils::DEFAULT_TIME;
                        }
+
                        $condition = ['`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime];
                        DBA::delete('photo', $condition);
                }
@@ -228,12 +238,12 @@ class CronJobs
 
                $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(NETWORK_DIASPORA));
+                               ORDER BY RAND() LIMIT 50", DBA::escape(Protocol::DIASPORA));
                if (!DBA::isResult($r)) {
                        return;
                }
 
-               foreach ($r AS $contact) {
+               foreach ($r as $contact) {
                        // Quit the loop after 3 minutes
                        if (time() > ($starttime + 180)) {
                                return;
@@ -244,7 +254,7 @@ class CronJobs
                        }
 
                        $data = Probe::uri($contact["url"]);
-                       if ($data["network"] != NETWORK_DIASPORA) {
+                       if ($data["network"] != Protocol::DIASPORA) {
                                continue;
                        }
 
@@ -271,10 +281,6 @@ class CronJobs
                        }
                }
 
-               // Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
-               // This call is very "cheap" so we can do it at any time without a problem
-               q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
-
                // There was an issue where the nick vanishes from the contact table
                q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''");