[Scrutinizer] Fix undeclared variables in src/ (except Protocol/)

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

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index b3c03e905054b8c03c1d743fcdb4cd3365045281..a82fa12087ac9459bcc72c8cb4aba643a5663a3a 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -11,8 +11,8 @@ use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
-
-require_once 'include/datetime.php';
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 class DiscoverPoCo {
        /// @todo Clean up this mess of a parameter hell and split it in several classes
@@ -30,6 +30,8 @@ class DiscoverPoCo {
                - check_profile: Update remote profile data
                */
 
+               $search = "";
+               $mode = 0;
                if ($command == "dirsearch") {
                        $search = urldecode($param1);
                        $mode = 1;
@@ -47,10 +49,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;
                }
@@ -164,13 +163,13 @@ class DiscoverPoCo {
                                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"])));
@@ -196,7 +195,7 @@ class DiscoverPoCo {
                                }
                        } else {
                                q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
+                                       dbesc(DateTimeFormat::utcNow()), dbesc(normalise_link($user["url"])));
                        }
 
                        // Quit the loop after 3 minutes
@@ -217,7 +216,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)) {
@@ -268,7 +267,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) {
 
@@ -280,7 +279,7 @@ class DiscoverPoCo {
 
                $url = "http://gstools.org/api/users_search/".urlencode($search);
 
-               $result = z_fetch_url($url);
+               $result = Network::curl($url);
                if (!$result["success"]) {
                        return false;
                }