X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=5c6277e34c34b6dbf94b067e1528f022bcb7834e;hb=84189ac775b3e1bc36d9e9d8945624c1bca7fb55;hp=e272674354506bec4c20c2c0af12b007ab23b03b;hpb=2866f62c88dbf65d72cfe690150b2215515b803d;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index e272674354..5c6277e34c 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -43,7 +43,7 @@ function display_content(&$a, $update = 0) {
 		$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
 	}
 	else {
-		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
 	}
 
 	if(! $item_id) {
@@ -99,7 +99,7 @@ function display_content(&$a, $update = 0) {
 		notice( t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
-	
+
 	if ($is_owner) {
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
@@ -120,41 +120,76 @@ function display_content(&$a, $update = 0) {
 
 	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
+	//	        AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' ))
+
 	if($update) {
 
 		$r = q("SELECT id FROM item WHERE item.uid = %d
-		        AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+		        AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s'))
 		        $sql_extra AND unseen = 1",
 		        intval($a->profile['uid']),
 		        dbesc($item_id),
-		        dbesc($item_id) 
+		        dbesc($item_id)
 		);
 
 		if(!$r)
 			return '';
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	//	AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' )
+
+	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,  `item`.`network` AS `item_network`,
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+		FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 		and `item`.`moderated` = 0
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-		AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+		AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE (`id` = '%s' OR `uri` = '%s')
+		AND uid = %d)
 		$sql_extra
-		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
+		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
 		intval($a->profile['uid']),
 		dbesc($item_id),
-		dbesc($item_id)
+		dbesc($item_id),
+		intval($a->profile['uid'])
 	);
 
+	if(!$r && local_user()) {
+		// Check if this is another person's link to a post that we have
+		$r = q("SELECT `item`.uri FROM `item`
+			WHERE (`item`.`id` = '%s' OR `item`.`uri` = '%s' )
+			LIMIT 1",
+			dbesc($item_id),
+			dbesc($item_id)
+		);
+		if($r) {
+			$item_uri = $r[0]['uri'];
+			//	AND `item`.`parent` = ( SELECT `parent` FROM `item` FORCE INDEX (PRIMARY, `uri`) WHERE `uri` = '%s' AND uid = %d )
+
+			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,  `item`.`network` AS `item_network`,
+				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+				`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+				FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+				WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+				and `item`.`moderated` = 0
+				AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d)
+				ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
+				intval(local_user()),
+				dbesc($item_uri),
+				intval(local_user())
+			);
+		}
+	}
+
 
-	if(count($r)) {
+	if($r) {
 
 		if((local_user()) && (local_user() == $a->profile['uid'])) {
-			q("UPDATE `item` SET `unseen` = 0 
+			q("UPDATE `item` SET `unseen` = 0
 				WHERE `parent` = %d AND `unseen` = 1",
 				intval($r[0]['parent'])
 			);
@@ -171,45 +206,68 @@ function display_content(&$a, $update = 0) {
 		require_once("include/html2plain.php");
 		$description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true));
 		$title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
+		$author_name = $r[0]["author-name"];
+
+		$image = "";
+		if ($image == "")
+			$image = $r[0]["thumb"];
 
 		if ($title == "")
-			$title = $r[0]["author-name"];
+			$title = $author_name;
+
+		$description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
+		$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
+		$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 
 		//<meta name="keywords" content="">
-		$a->page['htmlhead'] .= '<meta name="author" content="'.$r[0]["author-name"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="author" content="'.$author_name.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
 
+		// Schema.org microdata
+		$a->page['htmlhead'] .= '<meta itemprop="name" content="'.$title.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta itemprop="description" content="'.$description.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta itemprop="image" content="'.$image.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta itemprop="author" content="'.$author_name.'" />'."\n";
+
+		// Twitter cards
+		$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:url" content="'.$r[0]["plink"].'" />'."\n";
+
+		// Dublin Core
 		$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
 
+		// Open Graph
 		$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
-		//<meta property="og:image" content="" />
+		$a->page['htmlhead'] .= '<meta property="og:image" content="'.$image.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$r[0]["plink"].'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$r[0]["author-name"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
 		// article:tag
 
+		return $o;
 	}
-	else {
-		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
-			dbesc($item_id),
-			dbesc($item_id)
-		);
-		if(count($r)) {
-			if($r[0]['deleted']) {
-				notice( t('Item has been removed.') . EOL );
-			}
-			else {	
-				notice( t('Permission denied.') . EOL ); 
-			}
+
+	$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		dbesc($item_id),
+		dbesc($item_id)
+	);
+	if($r) {
+		if($r[0]['deleted']) {
+			notice( t('Item has been removed.') . EOL );
 		}
 		else {
-			notice( t('Item not found.') . EOL );
+			notice( t('Permission denied.') . EOL );
 		}
-
+	}
+	else {
+		notice( t('Item not found.') . EOL );
 	}
 
 	return $o;