X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fp.php;h=3ea810614ea4be31680c03d21c3cbb26d4747dab;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=df904372add3165ecc3315acd67927337378865a;hpb=53412236173759ac0e307479bd13024d8d318893;p=friendica.git

diff --git a/mod/p.php b/mod/p.php
index df904372ad..3ea810614e 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -2,6 +2,10 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once("include/diaspora.php");
 
 function p_init($a){
@@ -31,11 +35,13 @@ function p_init($a){
 			$parts = parse_url($r[0]["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
-			$location = $host."/p/".$guid.".xml";
+			if (normalise_link($host) != normalise_link(System::baseUrl())) {
+				$location = $host."/p/".urlencode($guid).".xml";
 
-			header("HTTP/1.1 301 Moved Permanently");
-			header("Location:".$location);
-			killme();
+				header("HTTP/1.1 301 Moved Permanently");
+				header("Location:".$location);
+				killme();
+			}
 		}
 
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -44,16 +50,16 @@ function p_init($a){
 
 	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
 	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
 		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-	if (!$r) {
+	if (!dbm::is_result($r)) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}
 	$user = $r[0];
 
-	$status = diaspora::build_status($item[0], $user);
-	$xml = diaspora::build_post_xml($status["type"], $status["message"]);
+	$status = Diaspora::build_status($item[0], $user);
+	$xml = Diaspora::build_post_xml($status["type"], $status["message"]);
 
 	header("Content-Type: application/xml; charset=utf-8");
 	echo $xml;