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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index ec857836cc..771312f6ec 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -47,6 +47,31 @@ 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
 	 *
@@ -57,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"];
@@ -849,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)) {
@@ -1012,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"];
 		}