X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=5f1b24a79209f181c2a8e01a493c1c73bb5601cb;hb=0360f7197aac062eb2fecf95969658ca56068deb;hp=c097ee4c46f02418e1a3be5409d7b6df911dc73e;hpb=9e6bf793805e6c8ded23b91b1a30a0a118a45a46;p=friendica.git

diff --git a/mod/fetch.php b/mod/fetch.php
index c097ee4c46..5f1b24a792 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,39 +4,34 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Protocol\Diaspora;
+use Friendica\Model\Item;
+use Friendica\Model\User;
 use Friendica\Util\XML;
+use Friendica\Database\DBM;
 
 function fetch_init(App $a)
 {
 
-	if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+	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`
-			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
-	);
-	if (!$item) {
-		$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
-		);
-
-		if ($r) {
-			$parts = parse_url($r[0]["author-link"]);
+	$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
+		'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
+	$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+	$item = Item::selectFirst($fields, $condition);
+	if (!DBM::is_result($item)) {
+		$condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+		$item = Item::selectFirst(['author-link'], $condition);
+		if (DBM::is_result($item)) {
+			$parts = parse_url($item["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
 			if (normalise_link($host) != normalise_link(System::baseUrl())) {
@@ -48,25 +43,18 @@ 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` AND `contact`.`self`
-		WHERE `user`.`uid` = %d",
-		intval($item[0]["uid"])
-	);
-
-	if (!$r) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+	$user = User::getOwnerDataById($item["uid"]);
+	if (!$user) {
+		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
-	$user = $r[0];
 
-	$status = Diaspora::buildStatus($item[0], $user);
+	$status = Diaspora::buildStatus($item, $user);
 	$xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
 	// Send the envelope