Merge pull request #3279 from Hypolite/improvement/add-composer

[friendica.git] / include / cronjobs.php

diff --git a/include/cronjobs.php b/include/cronjobs.php
index 4c41f182fed2c530044e57f089690bf2f46babea..79ee32bb37f0224f4be80e76b0a2ea1fba160c01 100644 (file)
--- a/include/cronjobs.php
+++ b/include/cronjobs.php
@@ -11,6 +11,7 @@ function cronjobs_run(&$argv, &$argc){
        require_once('include/photos.php');
        require_once('include/user.php');
        require_once('include/socgraph.php');
+       require_once('include/Probe.php');
 
        // No parameter set? So return
        if ($argc <= 1) {
@@ -110,7 +111,7 @@ function cron_expire_and_remove_users() {
        // delete user and contact records for recently removed accounts
        $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
        if (dbm::is_result($r)) {
-               foreach($r as $user) {
+               foreach ($r as $user) {
                        q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
                        q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
                }
@@ -233,17 +234,11 @@ function cron_repair_diaspora(App $a) {
                        return;
                }
 
-               $server_url = poco_detect_server($contact["url"]);
-
-               if (($server_url != "") AND !poco_check_server($server_url)) {
-                       continue;
-               }
-
                if (!poco_reachable($contact["url"])) {
                        continue;
                }
 
-               $data = probe_url($contact["url"]);
+               $data = Probe::uri($contact["url"]);
                if ($data["network"] != NETWORK_DIASPORA) {
                        continue;
                }