X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=6892990c247ef54c7f8004f38e4375e1a724f6ab;hb=af39296f0640bc40e58f51ec47c4e5aa53a24316;hp=64eac174ac1917ff5ec35aff2c83d39fb4761e5f;hpb=20e71d21a6206c03f2137eb82edf8f8b3bc644f2;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index 64eac174ac..6892990c24 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -2,34 +2,45 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
-require_once("include/crypto.php");
-require_once("include/diaspora.php");
-require_once("include/xml.php");
 
-/// @TODO You always make it like this: function foo(&$a)
-/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
-function fetch_init(App &$a){
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Protocol\Diaspora;
+use Friendica\Util\XML;
 
-	if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+function fetch_init(App $a)
+{
+
+	if (($a->argc != 3) || (!in_array($a->argv[1], ["post", "status_message", "reshare"]))) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
 
 	$guid = $a->argv[2];
 
 	// Fetch the item
-	$item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
+	$item = q(
+		"SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
 			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);
+		dbesc($guid),
+		NETWORK_DFRN,
+		NETWORK_DIASPORA
+	);
 	if (!$item) {
-		$r = q("SELECT `author-link`
+		$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);
+			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())) {
+			if (normalise_link($host) != normalise_link(System::baseUrl())) {
 				$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
 
 				header("HTTP/1.1 301 Moved Permanently");
@@ -38,26 +49,30 @@ function fetch_init(App &$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`
-		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
+	$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 (!$r) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+		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"]);
 
 	// Send the envelope
 	header("Content-Type: application/magic-envelope+xml; charset=utf-8");
-	echo Diaspora::build_magic_envelope($xml, $user);
+	echo Diaspora::buildMagicEnvelope($xml, $user);
 
 	killme();
 }