X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=758ff0f13538da8020e524da74d6a3b02d45f2d5;hb=f2c1ecd19bb344137a91faab58d9a2524e0c8893;hp=635dcfc09ed6712ed439d3efa079a25e069aa70c;hpb=afe1a5934541475c51d0e266fa0ed1e0b9fdaa61;p=friendica.git diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 635dcfc09e..758ff0f135 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -92,7 +92,7 @@ class GServer const DETECT_NODEINFO_210 = 103; /** - * Check for the existance of a server and adds it in the background if not existant + * Check for the existence of a server and adds it in the background if not existant * * @param string $url * @param boolean $only_nodeinfo @@ -327,7 +327,7 @@ class GServer return DateTimeFormat::utc('now +1 month'); } - // The system hadn't been successul contacted for more than a month, so try again in three months + // The system hadn't been successful contacted for more than a month, so try again in three months return DateTimeFormat::utc('now +3 month'); } @@ -557,7 +557,7 @@ class GServer return false; } - // If the URL missmatches, then we mark the old entry as failure + // If the URL mismatches, then we mark the old entry as failure if (!Strings::compareLink($url, $original_url)) { self::setFailureByUrl($original_url); if (!self::getID($url, true) && !Network::isUrlBlocked($url)) { @@ -675,7 +675,7 @@ class GServer } // All following checks are done for systems that always have got a "host-meta" endpoint. - // With this check we don't have to waste time and ressources for dead systems. + // With this check we don't have to waste time and resources for dead systems. // Also this hopefully prevents us from receiving abuse messages. if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) { $validHostMeta = self::validHostMeta($url); @@ -869,7 +869,7 @@ class GServer } // Sanitize incoming data, see https://github.com/friendica/friendica/issues/8565 - $data['subscribe'] = (bool)$data['subscribe'] ?? false; + $data['subscribe'] = (bool)($data['subscribe'] ?? false); if (!$data['subscribe'] || empty($data['scope']) || !in_array(strtolower($data['scope']), ['all', 'tags'])) { $data['scope'] = ''; @@ -1585,17 +1585,16 @@ class GServer */ private static function getNomadVersion(string $url): string { - $version = ''; $curlResult = DI::httpClient()->get($url . '/api/z/1.0/version', HttpClientAccept::JSON); if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) { - return $version; + return ''; } $data = json_decode($curlResult->getBody(), true); if (empty($data)) { - return $version; + return ''; } - return $data ?? $version; + return $data ?? ''; } /** @@ -2438,7 +2437,7 @@ class GServer } } - // Disvover Mastodon servers + // Discover Mastodon servers $accesstoken = DI::config()->get('system', 'instances_social_key'); if (!empty($accesstoken)) {