X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=008106ec3f41f6f60fd2b56d23286219465c803b;hb=a60a440c9af0caf5127c47bb59531138c906ea75;hp=23b97a5cd060346da07652fc810e74d9cb9377fd;hpb=24a4eb9699eb0eb96c74e9fb86a4d40d5a2975fe;p=friendica.git diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 23b97a5cd0..008106ec3f 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -12,6 +12,7 @@ namespace Friendica\Network; use DOMDocument; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\DBA; @@ -23,11 +24,10 @@ use Friendica\Protocol\ActivityPub; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Util\Strings; use Friendica\Util\XML; use DomXPath; -require_once 'include/dba.php'; - /** * @brief This class contain functions for probing URL * @@ -35,6 +35,7 @@ require_once 'include/dba.php'; class Probe { private static $baseurl; + private static $istimeout; /** * @brief Rearrange the array so that it always has the same order @@ -74,7 +75,7 @@ class Probe */ private static function ownHost($host) { - $own_host = get_app()->getHostName(); + $own_host = \get_app()->getHostName(); $parts = parse_url($host); @@ -97,6 +98,7 @@ class Probe * @param string $host The host part of an url * * @return array with template and type of the webfinger template for JSON or XML + * @throws HTTPException\InternalServerErrorException */ private static function hostMeta($host) { @@ -109,7 +111,7 @@ class Probe $xrd_timeout = Config::get('system', 'xrd_timeout', 20); $redirects = 0; - logger("Probing for ".$host, LOGGER_DEBUG); + Logger::log("Probing for ".$host, Logger::DEBUG); $xrd = null; $curlResult = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']); @@ -122,7 +124,8 @@ class Probe if (!is_object($xrd)) { $curlResult = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']); if ($curlResult->isTimeout()) { - logger("Probing timeout for " . $url, LOGGER_DEBUG); + Logger::log("Probing timeout for " . $url, Logger::DEBUG); + self::$istimeout = true; return false; } $xml = $curlResult->getBody(); @@ -130,13 +133,13 @@ class Probe $host_url = 'http://'.$host; } if (!is_object($xrd)) { - logger("No xrd object found for ".$host, LOGGER_DEBUG); + Logger::log("No xrd object found for ".$host, Logger::DEBUG); return []; } $links = XML::elementToArray($xrd); if (!isset($links["xrd"]["link"])) { - logger("No xrd data found for ".$host, LOGGER_DEBUG); + Logger::log("No xrd data found for ".$host, Logger::DEBUG); return []; } @@ -155,16 +158,16 @@ class Probe continue; } - if (($attributes["rel"] == "lrdd") && !empty($attributes["template"])) { + if (!empty($attributes["rel"]) && $attributes["rel"] == "lrdd" && !empty($attributes["template"])) { $type = (empty($attributes["type"]) ? '' : $attributes["type"]); $lrdd[$type] = $attributes["template"]; } } - self::$baseurl = "http://".$host; + self::$baseurl = $host_url; - logger("Probing successful for ".$host, LOGGER_DEBUG); + Logger::log("Probing successful for ".$host, Logger::DEBUG); return $lrdd; } @@ -188,13 +191,14 @@ class Probe * @param string $hcard_url Link to the hcard - is returned by reference * * @return string profile link + * @throws HTTPException\InternalServerErrorException */ public static function webfingerDfrn($webbie, &$hcard_url) { $profile_link = ''; $links = self::lrdd($webbie); - logger('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA); + Logger::log('webfingerDfrn: '.$webbie.':'.print_r($links, true), Logger::DATA); if (count($links)) { foreach ($links as $link) { if ($link['@attributes']['rel'] === NAMESPACE_DFRN) { @@ -221,6 +225,7 @@ class Probe * @param string $uri Address that should be probed * * @return array uri data + * @throws HTTPException\InternalServerErrorException */ public static function lrdd($uri) { @@ -253,7 +258,7 @@ class Probe } if (!$lrdd) { - logger("No lrdd data found for ".$uri, LOGGER_DEBUG); + Logger::log("No lrdd data found for ".$uri, Logger::DEBUG); return []; } @@ -285,7 +290,7 @@ class Probe } if (!is_array($webfinger["links"])) { - logger("No webfinger links found for ".$uri, LOGGER_DEBUG); + Logger::log("No webfinger links found for ".$uri, Logger::DEBUG); return false; } @@ -315,11 +320,13 @@ class Probe * @param boolean $cache Use cached values? * * @return array uri data + * @throws HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function uri($uri, $network = "", $uid = -1, $cache = true) + public static function uri($uri, $network = '', $uid = -1, $cache = true) { if ($cache) { - $result = Cache::get("Probe::uri:".$network.":".$uri); + $result = Cache::get('Probe::uri:' . $network . ':' . $uri); if (!is_null($result)) { return $result; } @@ -329,40 +336,48 @@ class Probe $uid = local_user(); } + self::$istimeout = false; + if ($network != Protocol::ACTIVITYPUB) { $data = self::detect($uri, $network, $uid); } else { $data = null; } - $ap_profile = ActivityPub::probeProfile($uri); + // When the previous detection process had got a time out + // we could falsely detect a Friendica profile as AP profile. + if (!self::$istimeout) { + $ap_profile = ActivityPub::probeProfile($uri); - if (!empty($ap_profile) && (defaults($data, 'network', '') != Protocol::DFRN)) { - $data = $ap_profile; + if (!empty($ap_profile) && empty($network) && (defaults($data, 'network', '') != Protocol::DFRN)) { + $data = $ap_profile; + } + } else { + Logger::notice('Time out detected. AP will not be probed.', ['uri' => $uri]); } - if (!isset($data["url"])) { - $data["url"] = $uri; + if (!isset($data['url'])) { + $data['url'] = $uri; } - if (x($data, "photo")) { - $data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"])); + if (!empty($data['photo'])) { + $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo'])); } else { - $data["photo"] = System::baseUrl().'/images/person-175.jpg'; + $data['photo'] = System::baseUrl() . '/images/person-300.jpg'; } - if (empty($data["name"])) { - if (!empty($data["nick"])) { - $data["name"] = $data["nick"]; + if (empty($data['name'])) { + if (!empty($data['nick'])) { + $data['name'] = $data['nick']; } - if (!x($data, "name")) { - $data["name"] = $data["url"]; + if (empty($data['name'])) { + $data['name'] = $data['url']; } } - if (empty($data["nick"])) { - $data["nick"] = strtolower($data["name"]); + if (empty($data['nick'])) { + $data['nick'] = strtolower($data['name']); if (strpos($data['nick'], ' ')) { $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' '))); @@ -370,47 +385,49 @@ class Probe } if (!empty(self::$baseurl)) { - $data["baseurl"] = self::$baseurl; + $data['baseurl'] = self::$baseurl; } - if (empty($data["network"])) { - $data["network"] = Protocol::PHANTOM; + if (empty($data['network'])) { + $data['network'] = Protocol::PHANTOM; } $data = self::rearrangeData($data); // Only store into the cache if the value seems to be valid if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) { - Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY); + Cache::set('Probe::uri:' . $network . ':' . $uri, $data, Cache::DAY); /// @todo temporary fix - we need a real contact update function that updates only changing fields /// The biggest problem is the avatar picture that could have a reduced image size. /// It should only be updated if the existing picture isn't existing anymore. /// We only update the contact when it is no probing for a specific network. if (($data['network'] != Protocol::FEED) - && ($network == "") - && $data["name"] - && $data["nick"] - && $data["url"] - && $data["addr"] - && $data["poll"] + && ($network == '') + && $data['name'] + && $data['nick'] + && $data['url'] + && $data['addr'] + && $data['poll'] ) { - $fields = ['name' => $data['name'], - 'nick' => $data['nick'], - 'url' => $data['url'], - 'addr' => $data['addr'], - 'photo' => $data['photo'], - 'keywords' => $data['keywords'], - 'location' => $data['location'], - 'about' => $data['about'], - 'notify' => $data['notify'], - 'network' => $data['network'], - 'server_url' => $data['baseurl']]; + $fields = [ + 'name' => $data['name'], + 'nick' => $data['nick'], + 'url' => $data['url'], + 'addr' => $data['addr'], + 'photo' => $data['photo'], + 'keywords' => $data['keywords'], + 'location' => $data['location'], + 'about' => $data['about'], + 'notify' => $data['notify'], + 'network' => $data['network'], + 'server_url' => $data['baseurl'] + ]; // This doesn't cover the case when a community isn't a community anymore if (!empty($data['community']) && $data['community']) { $fields['community'] = $data['community']; - $fields['contact-type'] = Contact::ACCOUNT_TYPE_COMMUNITY; + $fields['contact-type'] = Contact::TYPE_COMMUNITY; } $fieldnames = []; @@ -425,7 +442,7 @@ class Probe $fields['updated'] = DateTimeFormat::utcNow(); - $condition = ['nurl' => normalise_link($data["url"])]; + $condition = ['nurl' => Strings::normaliseLink($data['url'])]; $old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition); @@ -442,25 +459,27 @@ class Probe DBA::update('gcontact', $fields, $condition, $old_fields); - $fields = ['name' => $data['name'], - 'nick' => $data['nick'], - 'url' => $data['url'], - 'addr' => $data['addr'], - 'alias' => $data['alias'], - 'keywords' => $data['keywords'], - 'location' => $data['location'], - 'about' => $data['about'], - 'batch' => $data['batch'], - 'notify' => $data['notify'], - 'poll' => $data['poll'], - 'request' => $data['request'], - 'confirm' => $data['confirm'], - 'poco' => $data['poco'], - 'network' => $data['network'], - 'pubkey' => $data['pubkey'], - 'priority' => $data['priority'], - 'writable' => true, - 'rel' => Contact::SHARING]; + $fields = [ + 'name' => $data['name'], + 'nick' => $data['nick'], + 'url' => $data['url'], + 'addr' => $data['addr'], + 'alias' => $data['alias'], + 'keywords' => $data['keywords'], + 'location' => $data['location'], + 'about' => $data['about'], + 'batch' => $data['batch'], + 'notify' => $data['notify'], + 'poll' => $data['poll'], + 'request' => $data['request'], + 'confirm' => $data['confirm'], + 'poco' => $data['poco'], + 'network' => $data['network'], + 'pubkey' => $data['pubkey'], + 'priority' => $data['priority'], + 'writable' => true, + 'rel' => Contact::SHARING + ]; $fieldnames = []; @@ -472,7 +491,7 @@ class Probe } } - $condition = ['nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0]; + $condition = ['nurl' => Strings::normaliseLink($data['url']), 'self' => false, 'uid' => 0]; // "$old_fields" will return a "false" when the contact doesn't exist. // This won't trigger an insert. This is intended, since we only need @@ -523,6 +542,7 @@ class Probe * @param string $type type * * @return array fixed webfinger data + * @throws HTTPException\InternalServerErrorException */ private static function fixOStatus($webfinger, $lrdd, $type) { @@ -568,12 +588,13 @@ class Probe * @param integer $uid User ID for the probe (only used for mails) * * @return array uri data + * @throws HTTPException\InternalServerErrorException */ private static function detect($uri, $network, $uid) { $parts = parse_url($uri); - if (!empty($parts["scheme"]) && !empty($parts["host"]) && !empty($parts["path"])) { + if (!empty($parts["scheme"]) && !empty($parts["host"])) { $host = $parts["host"]; if (!empty($parts["port"])) { $host .= ':'.$parts["port"]; @@ -588,14 +609,14 @@ class Probe return []; } - $path_parts = explode("/", trim($parts["path"], "/")); + $path_parts = explode("/", trim(defaults($parts, 'path', ''), "/")); while (!$lrdd && (sizeof($path_parts) > 1)) { $host .= "/".array_shift($path_parts); $lrdd = self::hostMeta($host); } if (!$lrdd) { - logger('No XRD data was found for '.$uri, LOGGER_DEBUG); + Logger::log('No XRD data was found for '.$uri, Logger::DEBUG); return self::feed($uri); } $nick = array_pop($path_parts); @@ -630,12 +651,12 @@ class Probe } if (!$lrdd) { - logger('No XRD data was found for '.$uri, LOGGER_DEBUG); + Logger::log('No XRD data was found for '.$uri, Logger::DEBUG); return self::mail($uri, $uid); } $addr = $uri; } else { - logger("Uri ".$uri." was not detectable", LOGGER_DEBUG); + Logger::log("Uri ".$uri." was not detectable", Logger::DEBUG); return false; } @@ -680,7 +701,7 @@ class Probe $result = false; - logger("Probing ".$uri, LOGGER_DEBUG); + Logger::log("Probing ".$uri, Logger::DEBUG); if (in_array($network, ["", Protocol::DFRN])) { $result = self::dfrn($webfinger); @@ -716,7 +737,7 @@ class Probe $result["url"] = $uri; } - logger($uri." is ".$result["network"], LOGGER_DEBUG); + Logger::log($uri." is ".$result["network"], Logger::DEBUG); if (empty($result["baseurl"])) { $pos = strpos($result["url"], $host); @@ -736,6 +757,7 @@ class Probe * @param string $type type * * @return array webfinger data + * @throws HTTPException\InternalServerErrorException */ private static function webfinger($url, $type) { @@ -744,6 +766,7 @@ class Probe $curlResult = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } $data = $curlResult->getBody(); @@ -751,7 +774,7 @@ class Probe $webfinger = json_decode($data, true); if (is_array($webfinger)) { if (!isset($webfinger["links"])) { - logger("No json webfinger links for ".$url, LOGGER_DEBUG); + Logger::log("No json webfinger links for ".$url, Logger::DEBUG); return false; } return $webfinger; @@ -760,13 +783,13 @@ class Probe // If it is not JSON, maybe it is XML $xrd = XML::parseString($data, false); if (!is_object($xrd)) { - logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG); + Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG); return false; } $xrd_arr = XML::elementToArray($xrd); if (!isset($xrd_arr["xrd"]["link"])) { - logger("No XML webfinger links for ".$url, LOGGER_DEBUG); + Logger::log("No XML webfinger links for ".$url, Logger::DEBUG); return false; } @@ -806,22 +829,24 @@ class Probe * @param array $data The already fetched data * * @return array noscrape data + * @throws HTTPException\InternalServerErrorException */ private static function pollNoscrape($noscrape_url, $data) { $curlResult = Network::curl($noscrape_url); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } $content = $curlResult->getBody(); if (!$content) { - logger("Empty body for ".$noscrape_url, LOGGER_DEBUG); + Logger::log("Empty body for ".$noscrape_url, Logger::DEBUG); return false; } $json = json_decode($content, true); if (!is_array($json)) { - logger("No json data for ".$noscrape_url, LOGGER_DEBUG); + Logger::log("No json data for ".$noscrape_url, Logger::DEBUG); return false; } @@ -922,12 +947,14 @@ class Probe * @param string $profile_link Link to the profile page * * @return array profile data + * @throws HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function profile($profile_link) { $data = []; - logger("Check profile ".$profile_link, LOGGER_DEBUG); + Logger::log("Check profile ".$profile_link, Logger::DEBUG); // Fetch data via noscrape - this is faster $noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link); @@ -961,7 +988,7 @@ class Probe $prof_data["fn"] = defaults($data, 'name' , null); $prof_data["key"] = defaults($data, 'pubkey' , null); - logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG); + Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), Logger::DEBUG); return $prof_data; } @@ -972,12 +999,15 @@ class Probe * @param array $webfinger Webfinger data * * @return array DFRN data + * @throws HTTPException\InternalServerErrorException */ private static function dfrn($webfinger) { $hcard_url = ""; $data = []; - foreach ($webfinger["links"] as $link) { + // The array is reversed to take into account the order of preference for same-rel links + // See: https://tools.ietf.org/html/rfc7033#section-4.4.4 + foreach (array_reverse($webfinger["links"]) as $link) { if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) { $data["network"] = Protocol::DFRN; } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) { @@ -1008,7 +1038,7 @@ class Probe foreach ($webfinger["aliases"] as $alias) { if (empty($data["url"]) && !strstr($alias, "@")) { $data["url"] = $alias; - } elseif (!strstr($alias, "@") && normalise_link($alias) != normalise_link($data["url"])) { + } elseif (!strstr($alias, "@") && Strings::normaliseLink($alias) != Strings::normaliseLink($data["url"])) { $data["alias"] = $alias; } elseif (substr($alias, 0, 5) == 'acct:') { $data["addr"] = substr($alias, 5); @@ -1051,11 +1081,13 @@ class Probe * @param boolean $dfrn Poll DFRN specific data * * @return array hcard data + * @throws HTTPException\InternalServerErrorException */ private static function pollHcard($hcard_url, $data, $dfrn = false) { $curlResult = Network::curl($hcard_url); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } $content = $curlResult->getBody(); @@ -1175,12 +1207,15 @@ class Probe * @param array $webfinger Webfinger data * * @return array Diaspora data + * @throws HTTPException\InternalServerErrorException */ private static function diaspora($webfinger) { $hcard_url = ""; $data = []; - foreach ($webfinger["links"] as $link) { + // The array is reversed to take into account the order of preference for same-rel links + // See: https://tools.ietf.org/html/rfc7033#section-4.4.4 + foreach (array_reverse($webfinger["links"]) as $link) { if (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) { $hcard_url = $link["href"]; } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) { @@ -1211,7 +1246,7 @@ class Probe if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) { foreach ($webfinger["aliases"] as $alias) { - if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) { + if (Strings::normaliseLink($alias) != Strings::normaliseLink($data["url"]) && ! strstr($alias, "@")) { $data["alias"] = $alias; } elseif (substr($alias, 0, 5) == 'acct:') { $data["addr"] = substr($alias, 5); @@ -1260,6 +1295,7 @@ class Probe * @param bool $short Short detection mode * * @return array|bool OStatus data or "false" on error or "true" on short mode + * @throws HTTPException\InternalServerErrorException */ private static function ostatus($webfinger, $short = false) { @@ -1267,21 +1303,22 @@ class Probe if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) { foreach ($webfinger["aliases"] as $alias) { - if (strstr($alias, "@") && !strstr(normalise_link($alias), "http://")) { + if (strstr($alias, "@") && !strstr(Strings::normaliseLink($alias), "http://")) { $data["addr"] = str_replace('acct:', '', $alias); } } } if (!empty($webfinger["subject"]) && strstr($webfinger["subject"], "@") - && !strstr(normalise_link($webfinger["subject"]), "http://") + && !strstr(Strings::normaliseLink($webfinger["subject"]), "http://") ) { $data["addr"] = str_replace('acct:', '', $webfinger["subject"]); } - $pubkey = ""; if (is_array($webfinger["links"])) { - foreach ($webfinger["links"] as $link) { + // The array is reversed to take into account the order of preference for same-rel links + // See: https://tools.ietf.org/html/rfc7033#section-4.4.4 + foreach (array_reverse($webfinger["links"]) as $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && ($link["href"] != "") @@ -1300,19 +1337,20 @@ class Probe } else { $pubkey = substr($pubkey, 5); } - } elseif (normalise_link($pubkey) == 'http://') { + } elseif (Strings::normaliseLink($pubkey) == 'http://') { $curlResult = Network::curl($pubkey); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } - $pubkey = $curlResult['body']; + $pubkey = $curlResult->getBody(); } $key = explode(".", $pubkey); if (sizeof($key) >= 3) { - $m = base64url_decode($key[1]); - $e = base64url_decode($key[2]); + $m = Strings::base64UrlDecode($key[1]); + $e = Strings::base64UrlDecode($key[2]); $data["pubkey"] = Crypto::meToPem($m, $e); } } @@ -1335,6 +1373,7 @@ class Probe // Fetch all additional data from the feed $curlResult = Network::curl($data["poll"]); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } $feed = $curlResult->getBody(); @@ -1440,12 +1479,15 @@ class Probe * * @param array $webfinger Webfinger data * + * @param $addr * @return array pump.io data */ private static function pumpio($webfinger, $addr) { $data = []; - foreach ($webfinger["links"] as $link) { + // The array is reversed to take into account the order of preference for same-rel links + // See: https://tools.ietf.org/html/rfc7033#section-4.4.4 + foreach (array_reverse($webfinger["links"]) as $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && ($link["href"] != "") @@ -1540,11 +1582,13 @@ class Probe * @param boolean $probe Do a probe if the page contains a feed link * * @return array feed data + * @throws HTTPException\InternalServerErrorException */ private static function feed($url, $probe = true) { $curlResult = Network::curl($url); if ($curlResult->isTimeout()) { + self::$istimeout = true; return false; } $feed = $curlResult->getBody(); @@ -1602,6 +1646,7 @@ class Probe * @param integer $uid User ID * * @return array mail data + * @throws \Exception */ private static function mail($uri, $uid) { @@ -1632,7 +1677,7 @@ class Probe } $msgs = Email::poll($mbox, $uri); - logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG); + Logger::log('searching '.$uri.', '.count($msgs).' messages found.', Logger::DEBUG); if (!count($msgs)) { return false; @@ -1647,8 +1692,8 @@ class Probe $data["nick"] = $data["name"]; $data["photo"] = Network::lookupAvatarByEmail($uri); $data["url"] = 'mailto:'.$uri; - $data["notify"] = 'smtp '.random_string(); - $data["poll"] = 'email '.random_string(); + $data["notify"] = 'smtp ' . Strings::getRandomHex(); + $data["poll"] = 'email ' . Strings::getRandomHex(); $x = Email::messageMeta($mbox, $msgs[0]); if (stristr($x[0]->from, $uri)) { @@ -1672,7 +1717,7 @@ class Probe } } - $data["name"] = notags($data["name"]); + $data["name"] = Strings::escapeTags($data["name"]); } } } @@ -1689,6 +1734,7 @@ class Probe * @param string $base Another path that is hopefully complete * * @return string fixed avatar path + * @throws \Exception */ public static function fixAvatar($avatar, $base) { @@ -1714,7 +1760,7 @@ class Probe $fixed = $scheme.$host.$port.$path.$query.$fragment; - logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA); + Logger::log('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, Logger::DATA); return $fixed; }