X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=91d894d2ee9ede193683747adaad0196f34a98a8;hb=977248f5105a2b3f127d0aa752ce27214605fbf0;hp=497fd3c51704bd4f468e708da9ac5f0a1f1153f3;hpb=6ccf038053431ae55100f061ee96d4549fe8f8ed;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 497fd3c517..91d894d2ee 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -6,13 +6,12 @@ namespace Friendica\Network; /** * @file src/Network/Probe.php - * @brief Functions for probing URL + * Functions for probing URL */ use DOMDocument; use DomXPath; -use Friendica\Core\Cache\Cache; -use Friendica\Core\Config; +use Friendica\Core\Cache\Duration; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; @@ -29,7 +28,7 @@ use Friendica\Util\Strings; use Friendica\Util\XML; /** - * @brief This class contain functions for probing URL + * This class contain functions for probing URL * */ class Probe @@ -38,7 +37,7 @@ class Probe private static $istimeout; /** - * @brief Rearrange the array so that it always has the same order + * Rearrange the array so that it always has the same order * * @param array $data Unordered data * @@ -68,7 +67,7 @@ class Probe } /** - * @brief Check if the hostname belongs to the own server + * Check if the hostname belongs to the own server * * @param string $host The hostname that is to be checked * @@ -91,7 +90,7 @@ class Probe } /** - * @brief Probes for webfinger path via "host-meta" + * Probes for webfinger path via "host-meta" * * We have to check if the servers in the future still will offer this. * It seems as if it was dropped from the standard. @@ -109,7 +108,7 @@ class Probe $ssl_url = "https://".$host."/.well-known/host-meta"; $url = "http://".$host."/.well-known/host-meta"; - $xrd_timeout = Config::get('system', 'xrd_timeout', 20); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); Logger::log("Probing for ".$host, Logger::DEBUG); $xrd = null; @@ -179,7 +178,7 @@ class Probe } /** - * @brief Perform Webfinger lookup and return DFRN data + * Perform Webfinger lookup and return DFRN data * * Given an email style address, perform webfinger lookup and * return the resulting DFRN profile URL, or if no DFRN profile URL @@ -222,7 +221,7 @@ class Probe } /** - * @brief Check an URI for LRDD data + * Check an URI for LRDD data * * this is a replacement for the "lrdd" function. * It isn't used in this class and has some redundancies in the code. @@ -318,7 +317,7 @@ class Probe } /** - * @brief Fetch information (protocol endpoints and user information) about a given uri + * Fetch information (protocol endpoints and user information) about a given uri * * @param string $uri Address that should be probed * @param string $network Test for this specific network @@ -401,6 +400,11 @@ class Probe $data['network'] = Protocol::PHANTOM; } + // Ensure that local connections always are DFRN + if (($network == '') && ($data['network'] != Protocol::PHANTOM) && (self::ownHost($data['baseurl'] ?? '') || self::ownHost($data['url']))) { + $data['network'] = Protocol::DFRN; + } + if (!isset($data['hide']) && in_array($data['network'], Protocol::FEDERATED)) { $data['hide'] = self::getHideStatus($data['url']); } @@ -409,7 +413,7 @@ class Probe // Only store into the cache if the value seems to be valid if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) { - DI::cache()->set('Probe::uri:' . $network . ':' . $uri, $data, Cache::DAY); + DI::cache()->set('Probe::uri:' . $network . ':' . $uri, $data, Duration::DAY); } return $data; @@ -480,7 +484,7 @@ class Probe } /** - * @brief Checks if a profile url should be OStatus but only provides partial information + * Checks if a profile url should be OStatus but only provides partial information * * @param array $webfinger Webfinger data * @param string $lrdd Path template for webfinger request @@ -524,7 +528,7 @@ class Probe } /** - * @brief Fetch information (protocol endpoints and user information) about a given uri + * Fetch information (protocol endpoints and user information) about a given uri * * This function is only called by the "uri" function that adds caching and rearranging of data. * @@ -829,9 +833,6 @@ class Probe if (!empty($profile['country'])) { $loc['country-name'] = $profile['country']; } - if (!empty($profile['hometown'])) { - $loc['locality'] = $profile['hometown']; - } $location = Profile::formatLocation($loc); if (!empty($location)) { $data['location'] = $location; @@ -842,7 +843,7 @@ class Probe } /** - * @brief Perform a webfinger request. + * Perform a webfinger request. * * For details see RFC 7033: * @@ -854,7 +855,7 @@ class Probe */ private static function webfinger($url, $type) { - $xrd_timeout = Config::get('system', 'xrd_timeout', 20); + $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20); $curlResult = Network::curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]); if ($curlResult->isTimeout()) { @@ -912,7 +913,7 @@ class Probe } /** - * @brief Poll the Friendica specific noscrape page. + * Poll the Friendica specific noscrape page. * * "noscrape" is a faster alternative to fetch the data from the hcard. * This functionality was originally created for the directory. @@ -1016,7 +1017,7 @@ class Probe } /** - * @brief Check for valid DFRN data + * Check for valid DFRN data * * @param array $data DFRN data * @@ -1044,7 +1045,7 @@ class Probe } /** - * @brief Fetch data from a DFRN profile page and via "noscrape" + * Fetch data from a DFRN profile page and via "noscrape" * * @param string $profile_link Link to the profile page * @@ -1096,7 +1097,7 @@ class Probe } /** - * @brief Check for DFRN contact + * Check for DFRN contact * * @param array $webfinger Webfinger data * @@ -1176,7 +1177,7 @@ class Probe } /** - * @brief Poll the hcard page (Diaspora and Friendica specific) + * Poll the hcard page (Diaspora and Friendica specific) * * @param string $hcard_url Link to the hcard page * @param array $data The already fetched data @@ -1304,7 +1305,7 @@ class Probe } /** - * @brief Check for Diaspora contact + * Check for Diaspora contact * * @param array $webfinger Webfinger data * @@ -1392,7 +1393,7 @@ class Probe } /** - * @brief Check for OStatus contact + * Check for OStatus contact * * @param array $webfinger Webfinger data * @param bool $short Short detection mode @@ -1519,7 +1520,7 @@ class Probe } /** - * @brief Fetch data from a pump.io profile page + * Fetch data from a pump.io profile page * * @param string $profile_link Link to the profile page * @@ -1580,7 +1581,7 @@ class Probe } /** - * @brief Check for pump.io contact + * Check for pump.io contact * * @param array $webfinger Webfinger data * @param string $addr @@ -1637,7 +1638,7 @@ class Probe } /** - * @brief Check for twitter contact + * Check for twitter contact * * @param string $uri * @@ -1697,7 +1698,7 @@ class Probe } /** - * @brief Check page for feed link + * Check page for feed link * * @param string $url Page link * @@ -1744,7 +1745,7 @@ class Probe } /** - * @brief Check for feed contact + * Check for feed contact * * @param string $url Profile link * @param boolean $probe Do a probe if the page contains a feed link @@ -1807,7 +1808,7 @@ class Probe } /** - * @brief Check for mail contact + * Check for mail contact * * @param string $uri Profile link * @param integer $uid User ID @@ -1895,7 +1896,7 @@ class Probe } /** - * @brief Mix two paths together to possibly fix missing parts + * Mix two paths together to possibly fix missing parts * * @param string $avatar Path to the avatar * @param string $base Another path that is hopefully complete