X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FSalmon.php;h=0d234b53f0151340494bfede168276e4382dcbd9;hb=e80d68ba53776bed047d897f52db7e25b35a479d;hp=1192781801bf284d8e4cb7e501348295e3a8129f;hpb=6fc9c6de3b99aa01212d29ea0d140334d4e38396;p=friendica.git

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 1192781801..0d234b53f0 100644
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Protocol/Salmon.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\Protocol;
 
 use Friendica\Core\Logger;
@@ -12,7 +29,8 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 /**
- * @brief Salmon Protocol class
+ * Salmon Protocol class
+ *
  * The Salmon Protocol is a message exchange protocol running over HTTP designed to decentralize commentary
  * and annotations made against newsfeed articles such as blog posts.
  */
@@ -22,6 +40,7 @@ class Salmon
 	 * @param string $uri     Uniform Resource Identifier
 	 * @param string $keyhash encoded key
 	 * @return mixed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function getKey($uri, $keyhash)
 	{
@@ -52,7 +71,7 @@ class Salmon
 					} else {
 						$ret[$x] = substr($ret[$x], 5);
 					}
-				} elseif (normalise_link($ret[$x]) == 'http://') {
+				} elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
 					$ret[$x] = Network::fetchUrl($ret[$x]);
 				}
 			}
@@ -86,6 +105,7 @@ class Salmon
 	 * @param string $url   url
 	 * @param string $slap  slap
 	 * @return integer
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function slapper($owner, $url, $slap)
 	{
@@ -205,6 +225,7 @@ class Salmon
 	/**
 	 * @param string $pubkey public key
 	 * @return string
+	 * @throws \Exception
 	 */
 	public static function salmonKey($pubkey)
 	{