X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=771312f6ec8498b3d64712d41d9052e86fa3328f;hb=357c0072bda29e9838eaedf1d157c534c596f2dd;hp=465bbeff76aff4d19a8da4a76a7bc2995e484850;hpb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 465bbeff76..771312f6ec 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1,18 +1,29 @@
 <?php
 /**
- * @file src/Network/Probe.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
-namespace Friendica\Network;
 
-/**
- * @file src/Network/Probe.php
- * Functions for probing URL
- */
+namespace Friendica\Network;
 
 use DOMDocument;
 use DomXPath;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -30,13 +41,37 @@ use Friendica\Util\XML;
 
 /**
  * This class contain functions for probing URL
- *
  */
 class Probe
 {
 	private static $baseurl;
 	private static $istimeout;
 
+	/**
+	 * Remove stuff from an URI that doesn't belong there
+	 *
+	 * @param string $URI
+	 * @return string Cleaned URI
+	 */
+	public static function cleanURI(string $URI)
+	{
+		// At first remove leading and trailing junk
+		$URI = trim($URI, "@#?:/ \t\n\r\0\x0B");
+
+		$parts = parse_url($URI);
+
+		if (empty($parts['scheme'])) {
+			return $URI;
+		}
+
+		// Remove the URL fragment, since these shouldn't be part of any profile URL
+		unset($parts['fragment']);
+
+		$URI = Network::unparseURL($parts);
+
+		return $URI;
+	}
+
 	/**
 	 * Rearrange the array so that it always has the same order
 	 *
@@ -47,7 +82,7 @@ class Probe
 	private static function rearrangeData($data)
 	{
 		$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type",
-				"community", "keywords", "location", "about", "gender", "hide",
+				"community", "keywords", "location", "about", "hide",
 				"batch", "notify", "poll", "request", "confirm", "poco",
 				"following", "followers", "inbox", "outbox", "sharedinbox",
 				"priority", "network", "pubkey", "baseurl"];
@@ -109,7 +144,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;
@@ -221,6 +256,28 @@ class Probe
 		return $profile_link;
 	}
 
+	/**
+	 * Get the link for the remote follow page for a given profile link
+	 *
+	 * @param sting $profile
+	 * @return string Remote follow page link
+	 */
+	public static function getRemoteFollowLink(string $profile)
+	{
+		$follow_link = '';
+
+		$links = self::lrdd($profile);
+
+		if (!empty($links) && is_array($links)) {
+			foreach ($links as $link) {
+				if ($link['@attributes']['rel'] === ActivityNamespace::OSTATUSSUB) {
+					$follow_link = $link['@attributes']['template'];
+				}
+			}
+		}
+		return $follow_link;
+	}
+
 	/**
 	 * Check an URI for LRDD data
 	 *
@@ -817,9 +874,6 @@ class Probe
 			if (!empty($profile['description'])) {
 				$data['about'] = $profile['description'];
 			}
-			if (!empty($profile['gender'])) {
-				$data['gender'] = $profile['gender'];
-			}
 			if (!empty($profile['keywords'])) {
 				$keywords = implode(', ', $profile['keywords']);
 				if (!empty($keywords)) {
@@ -834,9 +888,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;
@@ -859,7 +910,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()) {
@@ -983,10 +1034,6 @@ class Probe
 			$data["about"] = $json["about"];
 		}
 
-		if (!empty($json["gender"])) {
-			$data["gender"] = $json["gender"];
-		}
-
 		if (!empty($json["key"])) {
 			$data["pubkey"] = $json["key"];
 		}