Merge pull request #6638 from Ixiter/develop-markdown-anchors

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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 3c136331f944c2988b4a156778ae1e1549bf2e5b..4e49dede8dae70bf48f1b18d7cf2c0b0d060a1f6 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -7,12 +7,14 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Cron
 {
        public static function execute($parameter = '', $generation = 0)
@@ -35,15 +37,15 @@ class Cron
                if ($last) {
                        $next = $last + ($poll_interval * 60);
                        if ($next > time()) {
-                               logger('cron intervall not reached');
+                               Logger::log('cron intervall not reached');
                                return;
                        }
                }
 
-               logger('cron: start');
+               Logger::log('cron: start');
 
                // Fork the cron jobs in separate parts to avoid problems when one of them is crashing
-               Addon::forkHooks($a->queue['priority'], "cron");
+               Hook::fork($a->queue['priority'], "cron");
 
                // run queue delivery process in the background
                Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
@@ -113,7 +115,7 @@ class Cron
 
                // Ensure to have a .htaccess file.
                // this is a precaution for systems that update automatically
-               $basepath = $a->get_basepath();
+               $basepath = $a->getBasePath();
                if (!file_exists($basepath . '/.htaccess')) {
                        copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
                }
@@ -121,7 +123,7 @@ class Cron
                // Poll contacts
                self::pollContacts($parameter, $generation);
 
-               logger('cron: end');
+               Logger::log('cron: end');
 
                Config::set('system', 'last_cron', time());
 
@@ -131,25 +133,24 @@ class Cron
        /**
         * @brief Poll contacts for unreceived messages
         *
-        * @todo Currently it seems as if the following parameter aren't used at all ...
+        * @todo  Currently it seems as if the following parameter aren't used at all ...
         *
-        * @param string $parameter Parameter (force, restart, ...) for the contact polling
+        * @param string  $parameter Parameter (force, restart, ...) for the contact polling
         * @param integer $generation
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function pollContacts($parameter, $generation) {
                $manual_id  = 0;
                $generation = 0;
                $force      = false;
-               $restart    = false;
 
                if ($parameter == 'force') {
                        $force = true;
                }
                if ($parameter == 'restart') {
-                       $restart = true;
                        $generation = intval($generation);
                        if (!$generation) {
-                               killme();
+                               exit();
                        }
                }
 
@@ -164,8 +165,6 @@ class Cron
 
                Addon::reload();
 
-               $d = DateTimeFormat::utcNow();
-
                // Only poll from those with suitable relationships,
                // and which have a polling address and ignore Diaspora since
                // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
@@ -187,11 +186,11 @@ class Cron
                                        AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
                                        AND NOT `contact`.`self` AND NOT `contact`.`blocked`
                                WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_DIASPORA),
-                       dbesc(NETWORK_FEED),
-                       dbesc(NETWORK_MAIL)
+                       DBA::escape(Protocol::DFRN),
+                       DBA::escape(Protocol::OSTATUS),
+                       DBA::escape(Protocol::DIASPORA),
+                       DBA::escape(Protocol::FEED),
+                       DBA::escape(Protocol::MAIL)
                );
 
                if (!DBA::isResult($contacts)) {
@@ -201,15 +200,15 @@ class Cron
                foreach ($contacts as $contact) {
 
                        if ($manual_id) {
-                               $contact['last-update'] = NULL_DATE;
+                               $contact['last-update'] = DBA::NULL_DATETIME;
                        }
 
                        // Friendica and OStatus are checked once a day
-                       if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+                       if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
                                $contact['priority'] = 2;
                        }
 
-                       if ($contact['subhub'] && in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+                       if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
                                /*
                                 * We should be getting everything via a hub. But just to be sure, let's check once a day.
                                 * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
@@ -221,7 +220,7 @@ class Cron
                        }
 
                        // Check Diaspora contacts or followers once a week
-                       if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+                       if (($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
                                $contact['priority'] = 4;
                        }
 
@@ -276,7 +275,7 @@ class Cron
                                }
                        }
 
-                       if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) {
+                       if (($contact['network'] == Protocol::FEED) && ($contact['priority'] <= 3)) {
                                $priority = PRIORITY_MEDIUM;
                        } elseif ($contact['archive']) {
                                $priority = PRIORITY_NEGLIGIBLE;
@@ -284,9 +283,9 @@ class Cron
                                $priority = PRIORITY_LOW;
                        }
 
-                       logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
+                       Logger::log("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact['priority'] . " " . $contact["nick"] . " " . $contact["name"]);
 
-                       Worker::add(['priority' => $priority, 'dont_fork' => true], 'OnePoll', (int)$contact['id']);
+                       Worker::add(['priority' => $priority, 'dont_fork' => true, 'force_priority' => true], 'OnePoll', (int)$contact['id']);
                }
        }
 }