Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites...

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index a32f13ab61e589a3a7ccc898ccbc9086357dee60..d7771c08b8dee6b2cca2a0a50ad1dd9c52c095cf 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;
@@ -69,15 +70,15 @@ function cron_run(&$argv, &$argc){
 
        // run queue delivery process in the background
 
-       proc_run(PRIORITY_NEGLIGIBLE,"include/queue.php");
+       proc_run(PRIORITY_NEGLIGIBLE, "include/queue.php");
 
        // run the process to discover global contacts in the background
 
-       proc_run(PRIORITY_LOW,"include/discover_poco.php");
+       proc_run(PRIORITY_LOW, "include/discover_poco.php");
 
        // run the process to update locally stored global contacts in the background
 
-       proc_run(PRIORITY_LOW,"include/discover_poco.php", "checkcontact");
+       proc_run(PRIORITY_LOW, "include/discover_poco.php", "checkcontact");
 
        // Expire and remove user entries
        cron_expire_and_remove_users();
@@ -120,11 +121,15 @@ function cron_run(&$argv, &$argc){
 
                update_contact_birthdays();
 
-               proc_run(PRIORITY_LOW,"include/discover_poco.php", "suggestions");
+               proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
 
                set_config('system','last_expire_day',$d2);
 
-               proc_run(PRIORITY_LOW,'include/expire.php');
+               proc_run(PRIORITY_LOW, 'include/expire.php');
+
+               proc_run(PRIORITY_LOW, 'include/dbclean.php');
+
+               cron_update_photo_albums();
        }
 
        // Clear cache entries
@@ -146,6 +151,20 @@ function cron_run(&$argv, &$argc){
        return;
 }
 
+/**
+ * @brief Update the cached values for the number of photo albums per user
+ */
+function cron_update_photo_albums() {
+       $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
+       if (!dbm::is_result($r)) {
+               return;
+       }
+
+       foreach ($r AS $user) {
+               photo_albums($user['uid'], true);
+       }
+}
+
 /**
  * @brief Expire and remove user entries
  */
@@ -306,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);
@@ -355,10 +378,10 @@ function cron_clear_cache(&$a) {
        }
 
        // Delete the cached OEmbed entries that are older than one year
-       q("DELETE FROM `oembed` WHERE `created` < NOW() - INTERVAL 1 YEAR");
+       q("DELETE FROM `oembed` WHERE `created` < NOW() - INTERVAL 3 MONTH");
 
        // Delete the cached "parse_url" entries that are older than one year
-       q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 1 YEAR");
+       q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 3 MONTH");
 
        // Maximum table size in megabyte
        $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000;