X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=54d479259482556d01b81afb9c34a665cf97717a;hb=a11206dbcd662a73d1c8200f2bef5287533cdbe6;hp=f4a09b74e07a5f0ceb2ec17b0fe3db6abfd441fa;hpb=8a185a03464b01027a9bca122676d640f6311ac7;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index f4a09b74e0..54d4792594 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -19,10 +19,11 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\Objects;
+use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Strings;
-use Friendica\Module\Objects;
 
 function display_init(App $a)
 {
@@ -35,21 +36,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,12 +68,24 @@ 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);
+		return;
+	}
+
+	if ($a->argc >= 3 && $nick == 'feed-item') {
+		displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+	}
+
+	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')) {
@@ -96,7 +94,7 @@ function display_init(App $a)
 	}
 
 	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 +155,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 +163,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 +171,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];
@@ -195,27 +190,15 @@ function display_fetchauthor($a, $item)
 
 	$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
-	if (local_user()) {
-		if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-			$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
-		}
-	} elseif ($profiledata["network"] == Protocol::DFRN) {
-		$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
-		$profiledata["remoteconnect"] = $connect;
-	}
-
-	return($profiledata);
+	return $profiledata;
 }
 
 function display_content(App $a, $update = false, $update_uid = 0)
 {
 	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
-		notice(L10n::t('Public access denied.') . EOL);
-		return;
+		throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
 	}
 
-	require_once 'include/conversation.php';
-
 	$o = '';
 
 	if ($update) {
@@ -266,7 +249,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	}
 
 	if (!$item_id) {
-		System::httpExit(404);
+		throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
@@ -289,21 +272,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['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;
@@ -311,8 +298,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
 
 	if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
-		notice(L10n::t('Access to this profile has been restricted.') . EOL);
-		return;
+		throw new HTTPException\ForbiddenException(L10n::t('Access to this profile has been restricted.'));
 	}
 
 	// We need the editor here to be able to reshare an item.
@@ -348,7 +334,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 	$item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
 	if (!DBA::isResult($item)) {
-		System::httpExit(404);
+		throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
 	}
 
 	$item['uri'] = $item['parent-uri'];
@@ -423,9 +409,9 @@ function displayShowFeed($item_id, $conversation)
 {
 	$xml = DFRN::itemFeed($item_id, $conversation);
 	if ($xml == '') {
-		System::httpExit(500);
+		throw new HTTPException\InternalServerErrorException(L10n::t('The feed for this item is unavailable.'));
 	}
 	header("Content-type: application/atom+xml");
 	echo $xml;
-	killme();
+	exit();
 }