Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039...

[friendica.git] / include / cron.php

diff --git a/include/cron.php b/include/cron.php
index d7771c08b8dee6b2cca2a0a50ad1dd9c52c095cf..97744ed27a1e9c156c0a08ffe6e656e590a06cea 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -12,6 +12,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 
 require_once("boot.php");
 require_once("include/photos.php");
+require_once("include/user.php");
 
 
 function cron_run(&$argv, &$argc){
@@ -127,7 +128,7 @@ function cron_run(&$argv, &$argc){
 
                proc_run(PRIORITY_LOW, 'include/expire.php');
 
-               proc_run(PRIORITY_LOW, 'include/dbclean.php');
+               proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
 
                cron_update_photo_albums();
        }
@@ -263,7 +264,7 @@ function cron_poll_contacts($argc, $argv) {
                        intval($c['id'])
                );
 
-               if((! $res) || (! count($res)))
+               if (dbm::is_result($res))
                        continue;
 
                foreach($res as $contact) {
@@ -342,7 +343,7 @@ function cron_poll_contacts($argc, $argv) {
  *
  * @param App $a
  */
-function cron_clear_cache(&$a) {
+function cron_clear_cache(App &$a) {
 
        $last = get_config('system','cache_last_cleared');
 
@@ -429,7 +430,7 @@ function cron_clear_cache(&$a) {
  *
  * @param App $a
  */
-function cron_repair_diaspora(&$a) {
+function cron_repair_diaspora(App &$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));
@@ -454,6 +455,16 @@ function cron_repair_diaspora(&$a) {
  */
 function cron_repair_database() {
 
+       // Sometimes there seem to be issues where the "self" contact vanishes.
+       // We haven't found the origin of the problem by now.
+       $r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
+       if (dbm::is_result($r)) {
+               foreach ($r AS $user) {
+                       logger('Create missing self contact for user '.$user['uid']);
+                       user_create_self_contact($user['uid']);
+               }
+       }
+
        // 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");