Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index b36c2ca2154e378bebb5629b3c38d1459c7dfe26..dd208d492f753c96bbe32b338f87c2fb93b7fe57 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,9 +1,10 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
-require_once('include/socgraph.php');
-require_once('include/datetime.php');
+require_once 'include/probe.php';
+require_once 'include/socgraph.php';
+require_once 'include/datetime.php';
 
 function discover_poco_run(&$argv, &$argc) {
 
@@ -46,13 +47,12 @@ function discover_poco_run(&$argv, &$argc) {
        logger('start '.$search);
 
        if ($mode == 8) {
-               $profile_url = base64_decode($argv[2]);
-               if ($profile_url != "") {
-                       poco_last_updated($profile_url, true);
+               if ($argv[2] != "") {
+                       poco_last_updated($argv[2], true);
                }
        } elseif ($mode == 7) {
                if ($argc == 6) {
-                       $url = base64_decode($argv[5]);
+                       $url = $argv[5];
                } else {
                        $url = '';
                }
@@ -62,7 +62,7 @@ function discover_poco_run(&$argv, &$argc) {
        } elseif ($mode == 5) {
                update_server();
        } elseif ($mode == 4) {
-               $server_url = base64_decode($argv[2]);
+               $server_url = $argv[2];
                if ($server_url == "") {
                        return;
                }
@@ -80,12 +80,12 @@ function discover_poco_run(&$argv, &$argc) {
                logger($result, LOGGER_DEBUG);
        } elseif ($mode == 3) {
                update_suggestions();
-       } elseif (($mode == 2) AND get_config('system','poco_completion')) {
+       } elseif (($mode == 2) && get_config('system','poco_completion')) {
                discover_users();
-       } elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) {
+       } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) {
                discover_directory($search);
                gs_search_user($search);
-       } elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) {
+       } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) {
                // Query Friendica and Hubzilla servers for their users
                poco_discover();
 
@@ -118,7 +118,7 @@ function update_server() {
                }
                logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
 
-               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server["url"]));
+               proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server["url"]);
 
                if (++$updated > 250) {
                        return;
@@ -165,14 +165,19 @@ function discover_users() {
                        continue;
                }
 
+               $server_url = poco_detect_server($user["url"]);
+               $force_update = false;
+
                if ($user["server_url"] != "") {
+
+                       $force_update = (normalise_link($user["server_url"]) != normalise_link($server_url));
+
                        $server_url = $user["server_url"];
-               } else {
-                       $server_url = poco_detect_server($user["url"]);
                }
-               if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR poco_check_server($server_url, $user["network"])) {
+
+               if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
                        logger('Check profile '.$user["url"]);
-                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
+                       proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", $user["url"]);
 
                        if (++$checked > 100) {
                                return;
@@ -210,7 +215,7 @@ function discover_directory($search) {
                        if (dbm::is_result($exists)) {
                                logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
-                               if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
+                               if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
                                        ($exists[0]["updated"] < $exists[0]["last_failure"])) {
                                        continue;
                                }
@@ -232,7 +237,14 @@ function discover_directory($search) {
                        if ($data["network"] == NETWORK_DFRN) {
                                logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
                                logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
-                               poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
+
+                               if ($jj->tags != "") {
+                                       $data["keywords"] = $jj->tags;
+                               }
+
+                               $data["server_url"] = $data["baseurl"];
+
+                               update_gcontact($data);
                        } else {
                                logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
                        }
@@ -267,6 +279,8 @@ function gs_search_user($search) {
                return false;
        }
 
+       /// @TODO AS is considered as a notation for constants (as they usually being written all upper-case)
+       /// @TODO find all those and convert to all lower-case which is a keyword then
        foreach ($contacts->data AS $user) {
                $contact = probe_url($user->site_address."/".$user->name);
                if ($contact["network"] != NETWORK_PHANTOM) {