X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=1c73ad37185234328952834fa042bc0f237a8aa3;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=5db6250a214143d7c502f62e0df11cef4b5cbfd2;hpb=99f0746660ec51f7ec244bf1eb3c2e42f831b847;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index 5db6250a21..1c73ad3718 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -20,6 +20,22 @@ function fetch_init($a){
 			FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
 		dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
 	if (!$item) {
+		$r = q("SELECT `author-link`
+			FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+			dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+		if ($r) {
+			$parts = parse_url($r[0]["author-link"]);
+			$host = $parts["scheme"]."://".$parts["host"];
+
+			if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+				$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
+
+				header("HTTP/1.1 301 Moved Permanently");
+				header("Location:".$location);
+				killme();
+			}
+		}
+
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}
@@ -35,16 +51,11 @@ function fetch_init($a){
 	$user = $r[0];
 
 	$status = diaspora::build_status($item[0], $user);
-	$data = array("XML" => array("post" => array($status["type"] => $status["message"])));
-	$xml = xml::from_array($data, $xmlobj);
+	$xml = diaspora::build_post_xml($status["type"], $status["message"]);
 
 	// Send the envelope
 	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
 	echo diaspora::build_magic_envelope($xml, $user);
 
-	//header("Content-Type: application/xml; charset=utf-8");
-	//echo $xml;
-	//killme();
-
 	killme();
 }