Just some more fixed notice

[friendica.git] / src / Worker / DiscoverPoCo.php

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 96cfae00b61f3e43da5161864c5c0089e6bae876..2e36ab514d54d7df499051643e528ea8bc8f67a3 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -7,14 +7,16 @@ namespace Friendica\Worker;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
-require_once 'include/datetime.php';
-
-class DiscoverPoCo {
+class DiscoverPoCo
+{
        /// @todo Clean up this mess of a parameter hell and split it in several classes
        public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
        {
@@ -30,6 +32,8 @@ class DiscoverPoCo {
                - check_profile: Update remote profile data
                */
 
+               $search = "";
+               $mode = 0;
                if ($command == "dirsearch") {
                        $search = urldecode($param1);
                        $mode = 1;
@@ -47,10 +51,7 @@ class DiscoverPoCo {
                        $mode = 7;
                } elseif ($command == "check_profile") {
                        $mode = 8;
-               } elseif ($command == '') {
-                       $search = "";
-                       $mode = 0;
-               } else {
+               } elseif ($command !== "") {
                        logger("Unknown or missing parameter ".$command."\n");
                        return;
                }
@@ -90,7 +91,7 @@ class DiscoverPoCo {
                        }
                        logger($result, LOGGER_DEBUG);
                } elseif ($mode == 3) {
-                       GlobalContact::updateSuggestions();
+                       GContact::updateSuggestions();
                } elseif (($mode == 2) && Config::get('system', 'poco_completion')) {
                        self::discoverUsers();
                } elseif (($mode == 1) && ($search != "") && Config::get('system', 'poco_local_search')) {
@@ -102,7 +103,7 @@ class DiscoverPoCo {
 
                        // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
                        if (!Config::get('system', 'ostatus_disabled')) {
-                               GlobalContact::discoverGsUsers();
+                               GContact::discoverGsUsers();
                        }
                }
 
@@ -159,21 +160,21 @@ class DiscoverPoCo {
 
                        $urlparts = parse_url($user["url"]);
                        if (!isset($urlparts["scheme"])) {
-                               q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc(NETWORK_PHANTOM), dbesc(normalise_link($user["url"])));
+                               dba::update('gcontact', ['network' => NETWORK_PHANTOM],
+                                       ['nurl' => normalise_link($user["url"])]);
                                continue;
                         }
 
-                       if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
-                                                               "identi.ca", "alpha.app.net"))) {
-                               $networks = array("www.facebook.com" => NETWORK_FACEBOOK,
+                       if (in_array($urlparts["host"], ["www.facebook.com", "facebook.com", "twitter.com",
+                                                               "identi.ca", "alpha.app.net"])) {
+                               $networks = ["www.facebook.com" => NETWORK_FACEBOOK,
                                                "facebook.com" => NETWORK_FACEBOOK,
                                                "twitter.com" => NETWORK_TWITTER,
                                                "identi.ca" => NETWORK_PUMPIO,
-                                               "alpha.app.net" => NETWORK_APPNET);
+                                               "alpha.app.net" => NETWORK_APPNET];
 
-                               q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc($networks[$urlparts["host"]]), dbesc(normalise_link($user["url"])));
+                               dba::update('gcontact', ['network' => $networks[$urlparts["host"]]],
+                                       ['nurl' => normalise_link($user["url"])]);
                                continue;
                        }
 
@@ -195,8 +196,8 @@ class DiscoverPoCo {
                                        return;
                                }
                        } else {
-                               q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
+                               dba::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
+                                       ['nurl' => normalise_link($user["url"])]);
                        }
 
                        // Quit the loop after 3 minutes
@@ -217,7 +218,7 @@ class DiscoverPoCo {
                        }
                }
 
-               $x = fetch_url(get_server()."/lsearch?p=1&n=500&search=".urlencode($search));
+               $x = Network::fetchUrl(get_server()."/lsearch?p=1&n=500&search=".urlencode($search));
                $j = json_decode($x);
 
                if (count($j->results)) {
@@ -256,7 +257,7 @@ class DiscoverPoCo {
 
                                        $data["server_url"] = $data["baseurl"];
 
-                                       GlobalContact::update($data);
+                                       GContact::update($data);
                                } else {
                                        logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
                                }
@@ -268,7 +269,7 @@ class DiscoverPoCo {
        /**
         * @brief Search for GNU Social user with gstools.org
         *
-        * @param str $search User name
+        * @param string $search User name
         */
        private static function gsSearchUser($search) {
 
@@ -276,11 +277,9 @@ class DiscoverPoCo {
                // It is not removed since I hope that there will be a successor.
                return false;
 
-               $a = get_app();
-
                $url = "http://gstools.org/api/users_search/".urlencode($search);
 
-               $result = z_fetch_url($url);
+               $result = Network::curl($url);
                if (!$result["success"]) {
                        return false;
                }
@@ -297,7 +296,7 @@ class DiscoverPoCo {
                        $contact = Probe::uri($user->site_address."/".$user->name);
                        if ($contact["network"] != NETWORK_PHANTOM) {
                                $contact["about"] = $user->description;
-                               GlobalContact::update($contact);
+                               GContact::update($contact);
                        }
                }
        }