Rename dbesc to DBA::escape

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

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 5bcff6d1a73b3ab53b44443e2d444b3641c3ad80..4b3474728ca23f1c790b78cbcb71901a175b9cb7 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -7,16 +7,15 @@ namespace Friendica\Worker;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
-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 = '')
        {
@@ -32,6 +31,8 @@ class DiscoverPoCo {
                - check_profile: Update remote profile data
                */
 
+               $search = "";
+               $mode = 0;
                if ($command == "dirsearch") {
                        $search = urldecode($param1);
                        $mode = 1;
@@ -49,10 +50,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;
                }
@@ -120,7 +118,7 @@ class DiscoverPoCo {
        private static function updateServer() {
                $r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return;
                }
 
@@ -149,8 +147,8 @@ class DiscoverPoCo {
                                WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
                                        `last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
                                        `network` IN ('%s', '%s', '%s', '%s', '') ORDER BY rand()",
-                               dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA),
-                               dbesc(NETWORK_OSTATUS), dbesc(NETWORK_FEED));
+                               DBA::escape(NETWORK_DFRN), DBA::escape(NETWORK_DIASPORA),
+                               DBA::escape(NETWORK_OSTATUS), DBA::escape(NETWORK_FEED));
 
                if (!$users) {
                        return;
@@ -161,8 +159,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;
                         }
 
@@ -174,8 +172,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;
                        }
 
@@ -197,8 +195,8 @@ class DiscoverPoCo {
                                        return;
                                }
                        } else {
-                               q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
-                                       dbesc(Temporal::convert()), dbesc(normalise_link($user["url"])));
+                               DBA::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
+                                       ['nurl' => normalise_link($user["url"])]);
                        }
 
                        // Quit the loop after 3 minutes
@@ -226,7 +224,7 @@ class DiscoverPoCo {
                        foreach ($j->results as $jj) {
                                // Check if the contact already exists
                                $exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
-                               if (DBM::is_result($exists)) {
+                               if (DBA::isResult($exists)) {
                                        logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
                                        if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
@@ -278,8 +276,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);