Issue-#3873

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index 081290d8106448b82b69e928d5bfdf92655b8468..8f09b7b01f7212dd3552e9a2f22132d36fbdb78b 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -10,6 +10,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/datetime.php';
@@ -39,7 +40,7 @@ require_once 'include/Photo.php';
  */
 function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
        // Call the function "poco_load_worker" via the worker
-       proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
+       Worker::add(PRIORITY_LOW, "discover_poco", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
 }
 
 /**
@@ -1158,8 +1159,9 @@ function poco_check_server($server_url, $network = "", $force = false) {
                                $network = NETWORK_OSTATUS;
                        }
                }
-               if (strstr($orig_version, 'Pleroma')) {
+               if (strstr($orig_version.$version, 'Pleroma')) {
                        $platform = 'Pleroma';
+                       $version = trim(str_replace('Pleroma', '', $version));
                }
        }
 
@@ -1554,11 +1556,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
        $network = array(NETWORK_DFRN);
 
-       if (get_config('system','diaspora_enabled')) {
+       if (Config::get('system','diaspora_enabled')) {
                $network[] = NETWORK_DIASPORA;
        }
 
-       if (!get_config('system','ostatus_disabled')) {
+       if (!Config::get('system','ostatus_disabled')) {
                $network[] = NETWORK_OSTATUS;
        }
 
@@ -1646,7 +1648,7 @@ function update_suggestions() {
 
        $done[] = System::baseUrl() . '/poco';
 
-       if (strlen(get_config('system','directory'))) {
+       if (strlen(Config::get('system','directory'))) {
                $x = fetch_url(get_server()."/pubsites");
                if ($x) {
                        $j = json_decode($x);
@@ -1701,13 +1703,13 @@ function poco_fetch_serverlist($poco) {
                $r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
                if (!dbm::is_result($r)) {
                        logger("Call server check for server ".$server_url, LOGGER_DEBUG);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
+                       Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
                }
        }
 }
 
 function poco_discover_federation() {
-       $last = get_config('poco','last_federation_discovery');
+       $last = Config::get('poco','last_federation_discovery');
 
        if ($last) {
                $next = $last + (24 * 60 * 60);
@@ -1723,7 +1725,7 @@ function poco_discover_federation() {
                $servers = json_decode($serverdata);
 
                foreach ($servers->pods as $server) {
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
+                       Worker::add(PRIORITY_LOW, "discover_poco", "server", "https://".$server->host);
                }
        }
 
@@ -1736,7 +1738,7 @@ function poco_discover_federation() {
 
                        foreach ($servers as $server) {
                                $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
-                               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
+                               Worker::add(PRIORITY_LOW, "discover_poco", "server", $url);
                        }
                }
        }
@@ -1744,7 +1746,7 @@ function poco_discover_federation() {
        // Currently disabled, since the service isn't available anymore.
        // It is not removed since I hope that there will be a successor.
        // Discover GNU Social Servers.
-       //if (!get_config('system','ostatus_disabled')) {
+       //if (!Config::get('system','ostatus_disabled')) {
        //      $serverdata = "http://gstools.org/api/get_open_instances/";
 
        //      $result = z_fetch_url($serverdata);
@@ -1756,7 +1758,7 @@ function poco_discover_federation() {
        //      }
        //}
 
-       set_config('poco','last_federation_discovery', time());
+       Config::set('poco','last_federation_discovery', time());
 }
 
 function poco_discover_single_server($id) {
@@ -1781,9 +1783,9 @@ function poco_discover_single_server($id) {
 
                poco_discover_server($data, 2);
 
-               if (get_config('system','poco_discovery') > 1) {
+               if (Config::get('system','poco_discovery') > 1) {
 
-                       $timeframe = get_config('system','poco_discovery_since');
+                       $timeframe = Config::get('system','poco_discovery_since');
                        if ($timeframe == 0) {
                                $timeframe = 30;
                        }
@@ -1801,7 +1803,7 @@ function poco_discover_single_server($id) {
                                $success = poco_discover_server(json_decode($retdata["body"]));
                        }
 
-                       if (!$success && (get_config('system','poco_discovery') > 2)) {
+                       if (!$success && (Config::get('system','poco_discovery') > 2)) {
                                logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
                                poco_discover_server_users($data, $server);
                        }
@@ -1828,7 +1830,7 @@ function poco_discover($complete = false) {
 
        $no_of_queries = 5;
 
-       $requery_days = intval(get_config("system", "poco_requery_days"));
+       $requery_days = intval(Config::get("system", "poco_requery_days"));
 
        if ($requery_days == 0) {
                $requery_days = 7;
@@ -1846,7 +1848,7 @@ function poco_discover($complete = false) {
                        }
 
                        logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
+                       Worker::add(PRIORITY_LOW, "discover_poco", "update_server_directory", (int)$server['id']);
 
                        if (!$complete && (--$no_of_queries == 0)) {
                                break;
@@ -2034,7 +2036,7 @@ function clean_contact_url($url) {
  */
 function fix_alternate_contact_address(&$contact) {
        if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
-               $data = probe_url($contact["url"]);
+               $data = Probe::uri($contact["url"]);
                if ($contact["network"] == NETWORK_OSTATUS) {
                        logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
                        $contact["url"] = $data["url"];
@@ -2124,7 +2126,7 @@ function get_gcontact_id($contact) {
 
        if ($doprobing) {
                logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
-               proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
+               Worker::add(PRIORITY_LOW, 'gprobe', $contact["url"]);
        }
 
        return $gcontact_id;
@@ -2292,7 +2294,7 @@ function update_gcontact($contact) {
  * @param str $url profile link
  */
 function update_gcontact_from_probe($url) {
-       $data = probe_url($url);
+       $data = Probe::uri($url);
 
        if (in_array($data["network"], array(NETWORK_PHANTOM))) {
                logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
@@ -2408,7 +2410,7 @@ function gs_fetch_users($server) {
  */
 function gs_discover() {
 
-       $requery_days = intval(get_config("system", "poco_requery_days"));
+       $requery_days = intval(Config::get("system", "poco_requery_days"));
 
        $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));