X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=b87fc0e8e025248ada5f1d5bb7fc32dc89153d47;hb=5b80a1fcaa04e96992cc54c27e8437a88df591f1;hp=cfcd82bb31e04dd345bcff26b8b5aa230e88614d;hpb=6f203b0a7533ae28e241bb22f4c140982396fadb;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index cfcd82bb31..b87fc0e8e0 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -6,7 +6,7 @@ require_once("include/crypto.php");
 require_once("include/diaspora.php");
 require_once("include/xml.php");
 
-function fetch_init($a){
+function fetch_init(App $a) {
 
 	if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -27,11 +27,13 @@ function fetch_init($a){
 			$parts = parse_url($r[0]["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
-			$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
+			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("HTTP/1.1 301 Moved Permanently");
+				header("Location:".$location);
+				killme();
+			}
 		}
 
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -40,7 +42,7 @@ function fetch_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) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -48,12 +50,12 @@ function fetch_init($a){
 	}
 	$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"]);
 
 	// Send the envelope
 	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
-	echo diaspora::build_magic_envelope($xml, $user);
+	echo Diaspora::build_magic_envelope($xml, $user);
 
 	killme();
 }