X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fp.php;h=2f69a231edf2ac21342ff0cc99699a62019538ce;hb=6ef2fd56f78b3bfe1df59bbd35bd9fdb547b3291;hp=f66dd43a23e41a0c74e35a79b8ba3baec3fb90dc;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git

diff --git a/mod/p.php b/mod/p.php
index f66dd43a23..2f69a231ed 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -4,19 +4,21 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
-
-require_once("include/diaspora.php");
+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();
 	}
 
@@ -34,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");
@@ -43,7 +45,7 @@ function p_init($a){
 			}
 		}
 
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
 
@@ -51,14 +53,14 @@ function p_init($a){
 	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
 		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;