Issue 6168: "redir" now mostly use OWA

src/Model/Contact.php

@@ -98,6 +98,26 @@ class Contact extends BaseObject
 	 * @}
 	 */
 
+	/**
+	 * @brief Get the basepath for a given contact link
+	 *
+	 * @param string $url The contact link
+	 *
+	 * @return string basepath
+	 */
+	public static function getBasepath($url)
+	{
+		$data = Probe::uri($url);
+		if (!empty($data['baseurl'])) {
+			return $data['baseurl'];
+		}
+
+		$urlarr = explode('/profile/', $url);
+                $basepath = $urlarr[0];
+
+		return $basepath;
+	}
+
 	/**
 	 * @brief Returns the contact id for the user and the public contact id for a given contact id
 	 *

src/Network/CurlResult.php

@@ -177,7 +177,7 @@ class CurlResult
 
 			$this->redirectUrl = Network::unparseURL($redirect_parts);
 
-			$this->isRedirectUrl = filter_var($this->redirectUrl, FILTER_VALIDATE_URL) !== false;
+			$this->isRedirectUrl = true;
 		} else {
 			$this->isRedirectUrl = false;
 		}

src/Network/Probe.php

@@ -164,7 +164,7 @@ class Probe
 			}
 		}
 
-		self::$baseurl = "http://".$host;
+		self::$baseurl = $host_url;
 
 		Logger::log("Probing successful for ".$host, Logger::DEBUG);
 

src/Util/LDSignature.php

@@ -27,7 +27,7 @@ class LDSignature
 		}
 
 		$actor = JsonLD::fetchElement($data, 'actor', 'id');
-		if (empty($actor)) {
+		if (empty($actor) || !is_string($actor)) {
 			return false;
 		}