X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=492f319efbb5b713c035ee23a59122634620a728;hb=708ffaff51d3f5112af6b1fbd25d7ff6391e496e;hp=4e7d8c751afc43dde451e77608321dcc4c40acbc;hpb=a6996601d5260e4dde621f4d04b35adbbc3c10e0;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index 4e7d8c751a..492f319efb 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,21 +4,18 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Protocol\Diaspora;
 use Friendica\Model\Item;
 use Friendica\Model\User;
-use Friendica\Util\XML;
+use Friendica\Util\Strings;
 use Friendica\Database\DBA;
 
 function fetch_init(App $a)
 {
-
 	if (($a->argc != 3) || (!in_array($a->argv[1], ["post", "status_message", "reshare"]))) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
+		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
 
 	$guid = $a->argv[2];
@@ -35,24 +32,22 @@ function fetch_init(App $a)
 			$parts = parse_url($item["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
-			if (normalise_link($host) != normalise_link(System::baseUrl())) {
+			if (Strings::normaliseLink($host) != Strings::normaliseLink(System::baseUrl())) {
 				$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
 
 				header("HTTP/1.1 301 Moved Permanently");
 				header("Location:".$location);
-				killme();
+				exit();
 			}
 		}
 
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
+		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
 
 	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
 	$user = User::getOwnerDataById($item["uid"]);
 	if (!$user) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
+		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
 
 	$status = Diaspora::buildStatus($item, $user);
@@ -62,5 +57,5 @@ function fetch_init(App $a)
 	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
 	echo Diaspora::buildMagicEnvelope($xml, $user);
 
-	killme();
+	exit();
 }