X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=acc2a5b0901540466009bb60e6066c28fc63e274;hb=51210af22157327376954721bfdca7161b66a7be;hp=2a4d2abf43b6d1971db094cffcaba8a65e969f13;hpb=2d9e1b8ec29d658bcbaee53f073b18bf651ac085;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 2a4d2abf43..acc2a5b090 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -19,10 +19,10 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\Objects;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Strings;
-use Friendica\Module\Objects;
 
 function display_init(App $a)
 {
@@ -35,21 +35,6 @@ function display_init(App $a)
 	}
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
-	$profiledata = [];
-
-	if ($a->argc == 3) {
-		if (substr($a->argv[2], -5) == '.atom') {
-			$item_id = substr($a->argv[2], 0, -5);
-			displayShowFeed($item_id, false);
-		}
-	}
-
-	if ($a->argc == 4) {
-		if ($a->argv[3] == 'conversation.atom') {
-			$item_id = $a->argv[2];
-			displayShowFeed($item_id, true);
-		}
-	}
 
 	$item = null;
 	$item_user = local_user();
@@ -82,21 +67,29 @@ function display_init(App $a)
 		if (!DBA::isResult($item)) {
 			$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [0, 2], 'uid' => 0]);
 		}
-	} elseif (($a->argc == 3) && ($nick == 'feed-item')) {
-		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => [0, 2], 'uid' => 0]);
+	} elseif ($a->argc >= 3 && $nick == 'feed-item') {
+		$item_id = $a->argv[2];
+		if (substr($item_id, -5) == '.atom') {
+			$item_id = substr($item_id, 0, -5);
+		}
+		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [0, 2], 'uid' => 0]);
 	}
 
 	if (!DBA::isResult($item)) {
 		System::httpExit(404);
 	}
 
+	if ($a->argc >= 3 && $nick == 'feed-item') {
+		displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+	}
+
 	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
 		Logger::log('Directly serving XML for id '.$item["id"], Logger::DEBUG);
 		displayShowFeed($item["id"], false);
 	}
 
 	if ($item["id"] != $item["parent"]) {
-		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
+		$item = Item::selectFirstForUser($item_user, $fields, ['id' => $item["parent"]]);
 	}
 
 	$profiledata = display_fetchauthor($a, $item);
@@ -157,7 +150,6 @@ function display_fetchauthor($a, $item)
 	}
 
 	if (!$skip) {
-		$author = "";
 		preg_match("/author='(.*?)'/ism", $attributes, $matches);
 		if (!empty($matches[1])) {
 			$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
@@ -166,7 +158,6 @@ function display_fetchauthor($a, $item)
 		if (!empty($matches[1])) {
 			$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 		}
-		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
 		if (!empty($matches[1])) {
 			$profiledata["url"] = $matches[1];
@@ -175,7 +166,6 @@ function display_fetchauthor($a, $item)
 		if (!empty($matches[1])) {
 			$profiledata["url"] = $matches[1];
 		}
-		$avatar = "";
 		preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
 		if (!empty($matches[1])) {
 			$profiledata["photo"] = $matches[1];
@@ -214,8 +204,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		return;
 	}
 
-	require_once 'include/conversation.php';
-
 	$o = '';
 
 	if ($update) {
@@ -289,22 +277,25 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$is_remote_contact = false;
 	$item_uid = local_user();
 
-	$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
-	if (DBA::isResult($parent)) {
-		$a->profile['uid'] = $parent['uid'];
-		$a->profile['profile_uid'] = $parent['uid'];
-		$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
-	}
-
-	if ($is_remote_contact) {
-		$cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
-		if (!empty($cdata['user'])) {
-			$groups = Group::getIdsByContactId($cdata['user']);
-			$remote_cid = $cdata['user'];
-			$item_uid = $parent['uid'];
+	if (isset($item_parent_uri)) {
+		$parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
+		if (DBA::isResult($parent)) {
+			$a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
+			$a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+			$is_remote_contact = Contact::isFollower(remote_user(), $a->profile['profile_uid']);
+
+			if ($is_remote_contact) {
+				$cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
+				if (!empty($cdata['user'])) {
+					$groups = Group::getIdsByContactId($cdata['user']);
+					$remote_cid = $cdata['user'];
+					$item_uid = $parent['uid'];
+				}
+			}
 		}
 	}
 
+
 	$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
 	if (DBA::isResult($page_contact)) {
 		$a->page_contact = $page_contact;
@@ -428,5 +419,5 @@ function displayShowFeed($item_id, $conversation)
 	}
 	header("Content-type: application/atom+xml");
 	echo $xml;
-	killme();
+	exit();
 }