<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Worker;
use Friendica\Core\Logger;
+use Friendica\Database\DBA;
use Friendica\Model\GServer;
use Friendica\Util\Strings;
* @param string $server_url Server URL
* @param boolean $only_nodeinfo Only use nodeinfo for server detection
*/
- public static function execute(string $server_url, bool $only_nodeinfo = false, bool $force = false)
+ public static function execute(string $server_url, bool $only_nodeinfo = false)
{
if (empty($server_url)) {
return;
$filtered = filter_var($server_url, FILTER_SANITIZE_URL);
if (substr(Strings::normaliseLink($filtered), 0, 7) != 'http://') {
- GServer::setFailure($filtered);
+ GServer::setFailure($server_url);
return;
}
- $ret = GServer::check($filtered, '', $force, $only_nodeinfo);
+ if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
+ GServer::setFailure($server_url);
+ return;
+ }
+
+ $cleaned = GServer::cleanURL($server_url);
+ if (($cleaned != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
+ GServer::setFailure($server_url);
+ return;
+ }
+
+ $ret = GServer::check($filtered, '', true, $only_nodeinfo);
Logger::info('Updated gserver', ['url' => $filtered, 'result' => $ret]);
}
}