Opps, this has vanished by accident, thanks to @annando

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index c03745a4429e0d38bb1502e433ede5f0b3a516d0..008260592fd1d18119227a0e6381fb30d9979f6c 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){
@@ -41,7 +42,7 @@ function cron_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run") {
-               if (App::maxload_reached())
+               if ($a->maxload_reached())
                        return;
                if (App::is_already_running('cron', 'include/cron.php', 540))
                        return;
@@ -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);
@@ -363,14 +362,14 @@ function cron_clear_cache(&$a) {
        clear_cache();
 
        // clear cache for photos
-       clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+       clear_cache(App::get_basepath(), App::get_basepath()."/photo");
 
        // clear smarty cache
-       clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+       clear_cache(App::get_basepath()."/view/smarty3/compiled", App::get_basepath()."/view/smarty3/compiled");
 
        // clear cache for image proxy
        if (!get_config("system", "proxy_disabled")) {
-               clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+               clear_cache(App::get_basepath(), App::get_basepath()."/proxy");
 
                $cachetime = get_config('system','proxy_cache_time');
                if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
@@ -434,7 +433,7 @@ function cron_repair_diaspora(&$a) {
        $r = q("SELECT `id`, `url` FROM `contact`
                WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
                        ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
-       if ($r) {
+       if (dbm::is_result($r)) {
                foreach ($r AS $contact) {
                        if (poco_reachable($contact["url"])) {
                                $data = probe_url($contact["url"]);
@@ -464,7 +463,7 @@ function cron_repair_database() {
 
        // Update the global contacts for local users
        $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
-       if ($r)
+       if (dbm::is_result($r))
                foreach ($r AS $user)
                        update_gcontact_for_user($user["uid"]);