X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fp.php;h=8da044e9323916e742b2b1bb24404fefe854acdf;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=ae25a0889eeb3ecc68923860d43ff153b950a09c;hpb=99f0746660ec51f7ec244bf1eb3c2e42f831b847;p=friendica.git

diff --git a/mod/p.php b/mod/p.php
index ae25a0889e..8da044e932 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -24,6 +24,22 @@ function p_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."/p/".urlencode($guid).".xml";
+
+				header("HTTP/1.1 301 Moved Permanently");
+				header("Location:".$location);
+				killme();
+			}
+		}
+
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}
@@ -39,8 +55,7 @@ function p_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"]);
 
 	header("Content-Type: application/xml; charset=utf-8");
 	echo $xml;