Merge pull request #6582 from MrPetovan/bug/6570-fix-diaspora-hashtags

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

diff --git a/src/Worker/GProbe.php b/src/Worker/GProbe.php
index 116ca207025d90cad7677b96cf8bb957d60bf2fa..49638c7c9482fbf76c23fe4c47bc60d6d71d6d45 100644 (file)
--- a/src/Worker/GProbe.php
+++ b/src/Worker/GProbe.php
@@ -6,11 +6,13 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\Strings;
 
 class GProbe {
        public static function execute($url = '')
@@ -21,10 +23,10 @@ class GProbe {
 
                $r = q(
                        "SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
-                       DBA::escape(normalise_link($url))
+                       DBA::escape(Strings::normaliseLink($url))
                );
 
-               logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
+               Logger::log("gprobe start for ".Strings::normaliseLink($url), Logger::DEBUG);
 
                if (!DBA::isResult($r)) {
                        // Is it a DDoS attempt?
@@ -33,7 +35,7 @@ class GProbe {
                        $result = Cache::get("gprobe:".$urlparts["host"]);
                        if (!is_null($result)) {
                                if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) {
-                                       logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
+                                       Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".defaults($_SERVER, "REMOTE_ADDR", '').". server data: ".print_r($_SERVER, true), Logger::DEBUG);
                                        return;
                                }
                        }
@@ -50,7 +52,7 @@ class GProbe {
 
                        $r = q(
                                "SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
-                               DBA::escape(normalise_link($url))
+                               DBA::escape(Strings::normaliseLink($url))
                        );
                }
                if (DBA::isResult($r)) {
@@ -60,7 +62,7 @@ class GProbe {
                        }
                }
 
-               logger("gprobe end for ".normalise_link($url), LOGGER_DEBUG);
+               Logger::log("gprobe end for ".Strings::normaliseLink($url), Logger::DEBUG);
                return;
        }
 }