X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=e81e654acb5528e2327d9c94a2d5d10c317d01be;hb=3359f3f5c7ecc4b6a34c4fcfc095ab4dd5fab0f1;hp=37d3a123a88d5ba3f0f172bc238475e217515ac1;hpb=3e8dc38180d443a22c3eaac283a91730a8cbbd7c;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 37d3a123a8..e81e654acb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,13 +1,15 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\System;
-
-require_once('include/dfrn.php');
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
 
-	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
 
@@ -17,7 +19,14 @@ function display_init(App $a) {
 	if ($a->argc == 3) {
 		if (substr($a->argv[2], -5) == '.atom') {
 			$item_id = substr($a->argv[2], 0, -5);
-			displayShowFeed($item_id);
+			displayShowFeed($item_id, false);
+		}
+	}
+
+	if ($a->argc == 4) {
+		if ($a->argv[3] == 'conversation.atom') {
+			$item_id = $a->argv[2];
+			displayShowFeed($item_id, true);
 		}
 	}
 
@@ -25,49 +34,48 @@ function display_init(App $a) {
 	if ($a->argc == 2) {
 		$nick = "";
 		$itemuid = 0;
+		$r = false;
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
-				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+						`author-avatar`, `network`, `body`, `uid`, `owner-link`
+				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
 					AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$nick = $a->user["nickname"];
 				$itemuid = local_user();
 			}
 		}
 
+		// Is it an item with uid=0?
+		if (!DBM::is_result($r)) {
+			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
+						`author-avatar`, `network`, `body`, `uid`, `owner-link`
+				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
+					AND `allow_cid` = ''  AND `allow_gid` = ''
+					AND `deny_cid`  = '' AND `deny_gid`  = ''
+					AND NOT `private` AND `uid` = 0
+					AND `guid` = ? LIMIT 1", $a->argv[1]);
+		}
+
 		// Or is it anywhere on the server?
-		if ($nick == "") {
-			$r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
+		if (!DBM::is_result($r)) {
+			$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+				`item`.`author-avatar`, `item`.`network`, `item`.`body`, `item`.`uid`, `item`.`owner-link`
 				FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
 				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 					AND NOT `item`.`private` AND NOT `user`.`hidewall`
 					AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
-			if (dbm::is_result($r)) {
-				$nick = $r["nickname"];
-				$itemuid = $r["uid"];
-			}
 		}
 
-		// Is it an item with uid=0?
-		if ($nick == "") {
-			$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
-				`item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
-				FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-					AND NOT `item`.`private` AND `item`.`uid` = 0
-					AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
-		}
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
 				logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
-				displayShowFeed($r["id"]);
+				displayShowFeed($r["id"], false);
 			}
 
 			if ($r["id"] != $r["parent"]) {
@@ -75,28 +83,6 @@ function display_init(App $a) {
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `id` = ?", $r["parent"]);
 			}
-			if (($itemuid != local_user()) && local_user()) {
-				// Do we know this contact but we haven't got this item?
-				// Copy the wohle thread to our local storage so that we can interact.
-				// We really should change this need for the future since it scales very bad.
-				$contactid = get_contact($r['owner-link'], local_user());
-				if ($contactid) {
-					$items = dba::select('item', array(), array('parent' => $r["id"]), array('order' => array('id')));
-					while ($item = dba::fetch($items)) {
-						$itemcontactid = get_contact($item['owner-link'], local_user());
-						if (!$itemcontactid) {
-							$itemcontactid = $contactid;
-						}
-						unset($item['id']);
-						$item['uid'] = local_user();
-						$item['origin'] = 0;
-						$item['contact-id'] = $itemcontactid;
-						$local_copy = item_store($item, false, false, true);
-						logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
-					}
-					dba::close($items);
-				}
-			}
 
 			$profiledata = display_fetchauthor($a, $r);
 
@@ -109,7 +95,7 @@ function display_init(App $a) {
 						WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
 						$nickname
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$profiledata = $r;
 					}
 					$profiledata["network"] = NETWORK_DFRN;
@@ -129,8 +115,6 @@ function display_init(App $a) {
 
 function display_fetchauthor($a, $item) {
 
-	require_once("include/Contact.php");
-
 	$profiledata = array();
 	$profiledata["uid"] = -1;
 	$profiledata["nickname"] = $item["author-name"];
@@ -196,7 +180,7 @@ function display_fetchauthor($a, $item) {
 		$profiledata["about"] = "";
 	}
 
-	$profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
+	$profiledata = Contact::getDetailsByURL($profiledata["url"], local_user(), $profiledata);
 
 	$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
@@ -214,7 +198,7 @@ function display_fetchauthor($a, $item) {
 
 function display_content(App $a, $update = 0) {
 
-	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice(t('Public access denied.') . EOL);
 		return;
 	}
@@ -242,45 +226,49 @@ function display_content(App $a, $update = 0) {
 			$nick = "";
 
 			if (local_user()) {
-				$r = dba::fetch_first("SELECT `id` FROM `item`
+				$r = dba::fetch_first("SELECT `id`, `parent` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
+					$item_parent = $r["parent"];
 					$nick = $a->user["nickname"];
 				}
 			}
 
 			if ($nick == "") {
-				$r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+				$r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND NOT `user`.`hidewall`
 						AND `item`.`guid` = ?", $a->argv[1]);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
+					$item_parent = $r["parent"];
 					$nick = $r["nickname"];
 				}
 			}
 			if ($nick == "") {
-				$r = dba::fetch_first("SELECT `item`.`id` FROM `item`
+				$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND `item`.`uid` = 0
 						AND `item`.`guid` = ?", $a->argv[1]);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
+					$item_parent = $r["parent"];
 				}
 			}
 		}
 	}
 
 	if ($item_id && !is_numeric($item_id)) {
-		$r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
-		if (dbm::is_result($r)) {
+		$r = dba::select('item', array('id', 'parent'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
+		if (DBM::is_result($r)) {
 			$item_id = $r["id"];
+			$item_parent = $r["parent"];
 		} else {
 			$item_id = false;
 		}
@@ -296,12 +284,15 @@ function display_content(App $a, $update = 0) {
 	$is_public = dba::exists('item', array('id' => $item_id, 'private' => false));
 	if ($is_public) {
 		$alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom';
+		$conversation = System::baseUrl().'/display/'.$nick.'/'.$item_parent.'/conversation.atom';
 	} else {
 		$alternate = '';
+		$conversation = '';
 	}
 
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'),
-				array('$alternate' => $alternate));
+				array('$alternate' => $alternate,
+					'$conversation' => $conversation));
 
 	$groups = array();
 
@@ -325,7 +316,7 @@ function display_content(App $a, $update = 0) {
 			$contact_id,
 			$a->profile['uid']
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r;
 			$remote_contact = true;
 		}
@@ -339,7 +330,7 @@ function display_content(App $a, $update = 0) {
 	}
 
 	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->page_contact = $r;
 	}
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
@@ -388,7 +379,7 @@ function display_content(App $a, $update = 0) {
 		$item_id
 	);
 
-	if (!dbm::is_result($r) && local_user()) {
+	if (!DBM::is_result($r) && local_user()) {
 		// Check if this is another person's link to a post that we have
 		$r = dba::fetch_first("SELECT `item`.uri FROM `item`
 			WHERE (`item`.`id` = ? OR `item`.`uri` = ?)
@@ -396,7 +387,7 @@ function display_content(App $a, $update = 0) {
 			$item_id,
 			$item_id
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$item_uri = $r['uri'];
 
 			$r = dba::p(item_query()." AND `item`.`uid` = ?
@@ -409,12 +400,12 @@ function display_content(App $a, $update = 0) {
 		}
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$s = dba::inArray($r);
 
 		if ((local_user()) && (local_user() == $a->profile['uid'])) {
 			$unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
-			if (dbm::is_result($unseen)) {
+			if (DBM::is_result($unseen)) {
 				dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
 			}
 		}
@@ -464,7 +455,7 @@ function display_content(App $a, $update = 0) {
 		$a->page['htmlhead'] .= '<meta name="twitter:card" content="summary" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.$image.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$s[0]["plink"].'" />'."\n";
 
 		// Dublin Core
@@ -474,7 +465,7 @@ function display_content(App $a, $update = 0) {
 		// Open Graph
 		$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta property="og:image" content="'.$image.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$s[0]["plink"].'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
@@ -486,7 +477,7 @@ function display_content(App $a, $update = 0) {
 		$item_id,
 		$item_id
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if ($r['deleted']) {
 			notice(t('Item has been removed.') . EOL);
 		} else {
@@ -499,8 +490,8 @@ function display_content(App $a, $update = 0) {
 	return $o;
 }
 
-function displayShowFeed($item_id) {
-	$xml = dfrn::itemFeed($item_id);
+function displayShowFeed($item_id, $conversation) {
+	$xml = DFRN::itemFeed($item_id, $conversation);
 	if ($xml == '') {
 		http_status_exit(500);
 	}