Just some more fixed notice

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

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 0657b0e1b23b4ffe6feaa2a1733a4fa707cb50b7..2e36ab514d54d7df499051643e528ea8bc8f67a3 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -7,15 +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\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 = '')
        {
@@ -31,6 +32,8 @@ class DiscoverPoCo {
                - check_profile: Update remote profile data
                */
 
+               $search = "";
+               $mode = 0;
                if ($command == "dirsearch") {
                        $search = urldecode($param1);
                        $mode = 1;
@@ -48,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;
                }
@@ -160,8 +160,8 @@ 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;
                         }
 
@@ -173,8 +173,8 @@ class DiscoverPoCo {
                                                "identi.ca" => NETWORK_PUMPIO,
                                                "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;
                        }
 
@@ -196,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
@@ -277,8 +277,6 @@ 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 = Network::curl($url);