use Friendica\Model\GContact;
use Friendica\Network\Probe;
use Friendica\Protocol\PortableContact;
+use Friendica\Util\Strings;
class GProbe {
public static function execute($url = '')
$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::log("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?
$result = Cache::get("gprobe:".$urlparts["host"]);
if (!is_null($result)) {
if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) {
- Logger::log("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;
}
}
$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)) {
}
}
- Logger::log("gprobe end for ".normalise_link($url), Logger::DEBUG);
+ Logger::log("gprobe end for ".Strings::normaliseLink($url), Logger::DEBUG);
return;
}
}