X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=3e9c4e662671ee4422de37a0c59e37d22d0506d0;hb=40e9bbeb88961e494510a18f24d595abfb83f9f8;hp=5f1b24a79209f181c2a8e01a493c1c73bb5601cb;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index 5f1b24a792..3e9c4e6626 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,54 +4,51 @@ 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\Database\DBM;
+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();
+		System::httpExit(404);
 	}
 
 	$guid = $a->argv[2];
 
 	// Fetch the item
 	$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
-		'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
-	$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+		'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'];
+	$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
 	$item = Item::selectFirst($fields, $condition);
-	if (!DBM::is_result($item)) {
-		$condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+	if (!DBA::isResult($item)) {
+		$condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
 		$item = Item::selectFirst(['author-link'], $condition);
-		if (DBM::is_result($item)) {
+		if (DBA::isResult($item)) {
 			$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();
+		System::httpExit(404);
 	}
 
 	// 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();
+		System::httpExit(404);
 	}
 
 	$status = Diaspora::buildStatus($item, $user);
@@ -61,5 +58,5 @@ function fetch_init(App $a)
 	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
 	echo Diaspora::buildMagicEnvelope($xml, $user);
 
-	killme();
+	exit();
 }