X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fp.php;h=2f69a231edf2ac21342ff0cc99699a62019538ce;hb=85c8bf022841fb53a42e012d2e90dd23f56df2ab;hp=4db8f552962c9f8504c4a6ed1ea3c29971c6de42;hpb=c825cc8d0d61386cb00b6310fc4ea46c4354460d;p=friendica.git

diff --git a/mod/p.php b/mod/p.php
index 4db8f55296..2f69a231ed 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -2,18 +2,23 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
-require_once("include/diaspora.php");
+
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function p_init($a){
 	if ($a->argc != 2) {
-		header($_SERVER["SERVER_PROTOCOL"].' 510 '.t('Not Extended'));
+		header($_SERVER["SERVER_PROTOCOL"].' 510 '.L10n::t('Not Extended'));
 		killme();
 	}
 
 	$guid = $a->argv[1];
 
 	if (strtolower(substr($guid, -4)) != ".xml") {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
 
@@ -31,7 +36,7 @@ function p_init($a){
 			$parts = parse_url($r[0]["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
-			if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+			if (normalise_link($host) != normalise_link(System::baseUrl())) {
 				$location = $host."/p/".urlencode($guid).".xml";
 
 				header("HTTP/1.1 301 Moved Permanently");
@@ -40,22 +45,22 @@ function p_init($a){
 			}
 		}
 
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
 
 	// 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 (!dbm::is_result($r)) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+	if (!DBM::is_result($r)) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::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::buildStatus($item[0], $user);
+	$xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
 	header("Content-Type: application/xml; charset=utf-8");
 	echo $xml;