Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private...

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index c03745a4429e0d38bb1502e433ede5f0b3a516d0..c92396dc7a446ce256e66f7e46d5d38d924c7a77 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once("boot.php");
+require_once("include/photos.php");
 
 
 function cron_run(&$argv, &$argc){
@@ -126,14 +127,7 @@ function cron_run(&$argv, &$argc){
 
                proc_run(PRIORITY_LOW, 'include/expire.php');
 
-               if (get_config("system", "worker")) {
-                       proc_run(PRIORITY_LOW, 'include/dbclean.php', 1);
-                       proc_run(PRIORITY_LOW, 'include/dbclean.php', 2);
-                       proc_run(PRIORITY_LOW, 'include/dbclean.php', 3);
-                       proc_run(PRIORITY_LOW, 'include/dbclean.php', 4);
-               } else {
-                       proc_run(PRIORITY_LOW, 'include/dbclean.php');
-               }
+               proc_run(PRIORITY_LOW, 'include/dbclean.php');
 
                cron_update_photo_albums();
        }
@@ -162,8 +156,9 @@ function cron_run(&$argv, &$argc){
  */
 function cron_update_photo_albums() {
        $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
-       if (!dbm::is_result($r))
+       if (!dbm::is_result($r)) {
                return;
+       }
 
        foreach ($r AS $user) {
                photo_albums($user['uid'], true);
@@ -330,7 +325,11 @@ function cron_poll_contacts($argc, $argv) {
 
                        logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
 
-                       proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
+                       if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) {
+                               proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', $contact['id']);
+                       } else {
+                               proc_run(PRIORITY_LOW, 'include/onepoll.php', $contact['id']);
+                       }
 
                        if($interval)
                                @time_sleep_until(microtime(true) + (float) $interval);