From: Michael <heluecht@pirati.ca>
Date: Wed, 7 Feb 2018 13:31:17 +0000 (+0000)
Subject: Quickfix: Removed exception since it blocked message delivery
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b1e91f7401ea8a768254fac497739220ba2ad5d0;p=friendica.git

Quickfix: Removed exception since it blocked message delivery
---

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 9caa0ab152..3d3ef21b9c 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -1,124 +1,124 @@
-<?php
-/*
- * @file src/Core/Protocol.php
- */
-namespace Friendica\Core;
-
-use Friendica\Util\Network;
-
-/**
- * Manage compatibility with federated networks
- *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
- */
-class Protocol
-{
-	const DFRN      = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
-	const DIASPORA  = 'dspr';    // Diaspora
-	const DIASPORA2 = 'dspc';    // Diaspora connector
-	const STATUSNET = 'stac';    // Statusnet connector
-	const OSTATUS   = 'stat';    // GNU-social, Pleroma, Mastodon, other OStatus implementations
-	const FEED      = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
-	const MAIL      = 'mail';    // IMAP/POP
-	const XMPP      = 'xmpp';    // XMPP - Currently unsupported
-
-	const FACEBOOK  = 'face';    // Facebook API
-	const LINKEDIN  = 'lnkd';    // LinkedIn
-	const MYSPACE   = 'mysp';    // MySpace - Currently unsupported
-	const GPLUS     = 'goog';    // Google+
-	const PUMPIO    = 'pump';    // pump.io
-	const TWITTER   = 'twit';    // Twitter
-	const APPNET    = 'apdn';    // app.net - Dead protocol
-
-	const NEWS      = 'nntp';    // Network News Transfer Protocol - Currently unsupported
-	const ICALENDAR = 'ical';    // iCalendar - Currently unsupported
-	const PNUT      = 'pnut';    // pnut.io - Currently unsupported
-	const ZOT       = 'zot!';    // Zot! - Currently unsupported
-
-	const PHANTOM   = 'unkn';    // Place holder
-
-	/**
-	 * Returns the address string for the provided profile URL
-	 *
-	 * @param string $profile_url
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function getAddrFromProfileUrl($profile_url)
-	{
-		$network = self::matchByProfileUrl($profile_url, $matches);
-
-		if ($network === self::PHANTOM) {
-			throw new Exception('Unknown network for profile URL: ' . $profile_url);
-		}
-
-		$addr = $matches[2] . '@' . $matches[1];
-
-		return $addr;
-	}
-
-	/**
-	 * Guesses the network from a profile URL
-	 *
-	 * @param string $profile_url
-	 * @param array  $matches     preg_match return array: [0] => Full match [1] => hostname [2] => username
-	 * @return type
-	 */
-	public static function matchByProfileUrl($profile_url, &$matches = [])
-	{
-		if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {
-			return self::TWITTER;
-		}
-
-		if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {
-			return self::APPNET;
-		}
-
-		if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {
-			return self::GPLUS;
-		}
-
-		if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {
-			return self::DFRN;
-		}
-
-		if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {
-			return self::DIASPORA;
-		}
-
-		if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {
-			// RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it
-			return self::DIASPORA;
-		}
-
-		if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {
-			$statusnet_host = $matches[1];
-			$statusnet_user = $matches[2];
-			$UserData = Network::fetchUrl('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
-			$user = json_decode($UserData);
-			if ($user) {
-				$matches[2] = $user->screen_name;
-				return self::STATUSNET;
-			}
-		}
-
-		// pumpio (http://host.name/user)
-		if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {
-			return self::PUMPIO;
-		}
-
-		return self::PHANTOM;
-	}
-
-	/**
-	 * Returns a formatted mention from a profile URL and a display name
-	 *
-	 * @param string $profile_url
-	 * @param string $display_name
-	 * @return string
-	 */
-	public static function formatMention($profile_url, $display_name)
-	{
-		return $display_name . '(' . self::getAddrFromProfileUrl($profile_url) . ')';
-	}
-}
+<?php
+/*
+ * @file src/Core/Protocol.php
+ */
+namespace Friendica\Core;
+
+use Friendica\Util\Network;
+
+/**
+ * Manage compatibility with federated networks
+ *
+ * @author Hypolite Petovan <mrpetovan@gmail.com>
+ */
+class Protocol
+{
+	const DFRN      = 'dfrn';    // Friendica, Mistpark, other DFRN implementations
+	const DIASPORA  = 'dspr';    // Diaspora
+	const DIASPORA2 = 'dspc';    // Diaspora connector
+	const STATUSNET = 'stac';    // Statusnet connector
+	const OSTATUS   = 'stat';    // GNU-social, Pleroma, Mastodon, other OStatus implementations
+	const FEED      = 'feed';    // RSS/Atom feeds with no known "post/notify" protocol
+	const MAIL      = 'mail';    // IMAP/POP
+	const XMPP      = 'xmpp';    // XMPP - Currently unsupported
+
+	const FACEBOOK  = 'face';    // Facebook API
+	const LINKEDIN  = 'lnkd';    // LinkedIn
+	const MYSPACE   = 'mysp';    // MySpace - Currently unsupported
+	const GPLUS     = 'goog';    // Google+
+	const PUMPIO    = 'pump';    // pump.io
+	const TWITTER   = 'twit';    // Twitter
+	const APPNET    = 'apdn';    // app.net - Dead protocol
+
+	const NEWS      = 'nntp';    // Network News Transfer Protocol - Currently unsupported
+	const ICALENDAR = 'ical';    // iCalendar - Currently unsupported
+	const PNUT      = 'pnut';    // pnut.io - Currently unsupported
+	const ZOT       = 'zot!';    // Zot! - Currently unsupported
+
+	const PHANTOM   = 'unkn';    // Place holder
+
+	/**
+	 * Returns the address string for the provided profile URL
+	 *
+	 * @param string $profile_url
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function getAddrFromProfileUrl($profile_url)
+	{
+		$network = self::matchByProfileUrl($profile_url, $matches);
+
+		if ($network === self::PHANTOM) {
+			return "";
+		}
+
+		$addr = $matches[2] . '@' . $matches[1];
+
+		return $addr;
+	}
+
+	/**
+	 * Guesses the network from a profile URL
+	 *
+	 * @param string $profile_url
+	 * @param array  $matches     preg_match return array: [0] => Full match [1] => hostname [2] => username
+	 * @return type
+	 */
+	public static function matchByProfileUrl($profile_url, &$matches = [])
+	{
+		if (preg_match('=https?://(twitter\.com)/(.*)=ism', $profile_url, $matches)) {
+			return self::TWITTER;
+		}
+
+		if (preg_match('=https?://(alpha\.app\.net)/(.*)=ism', $profile_url, $matches)) {
+			return self::APPNET;
+		}
+
+		if (preg_match('=https?://(plus\.google\.com)/(.*)=ism', $profile_url, $matches)) {
+			return self::GPLUS;
+		}
+
+		if (preg_match('=https?://(.*)/profile/(.*)=ism', $profile_url, $matches)) {
+			return self::DFRN;
+		}
+
+		if (preg_match('=https?://(.*)/u/(.*)=ism', $profile_url, $matches)) {
+			return self::DIASPORA;
+		}
+
+		if (preg_match('=https?://(.*)/channel/(.*)=ism', $profile_url, $matches)) {
+			// RedMatrix/Hubzilla is identified as Diaspora - friendica can't connect directly to it
+			return self::DIASPORA;
+		}
+
+		if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {
+			$statusnet_host = $matches[1];
+			$statusnet_user = $matches[2];
+			$UserData = Network::fetchUrl('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
+			$user = json_decode($UserData);
+			if ($user) {
+				$matches[2] = $user->screen_name;
+				return self::STATUSNET;
+			}
+		}
+
+		// pumpio (http://host.name/user)
+		if (preg_match('=https?://([\.\w]+)/([\.\w]+)$=ism', $profile_url, $matches)) {
+			return self::PUMPIO;
+		}
+
+		return self::PHANTOM;
+	}
+
+	/**
+	 * Returns a formatted mention from a profile URL and a display name
+	 *
+	 * @param string $profile_url
+	 * @param string $display_name
+	 * @return string
+	 */
+	public static function formatMention($profile_url, $display_name)
+	{
+		return $display_name . '(' . self::getAddrFromProfileUrl($profile_url) . ')';
+	}
+}