X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=efae937e16f59bcaea10e14e0ad8ecec355ff42a;hb=4b0e370c4c2ec606833aa326fba49922a7c470ab;hp=2e0b8216a4a7fc09316522177001aba54cef5f7d;hpb=fdd142c42ef097912e8fad1dc200ea091d769c1e;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 2e0b8216a4..efae937e16 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,8 +4,6 @@
 function display_init(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-		notice( t('Public access denied.') . EOL);
-		killme();
 		return;
 	}
 
@@ -17,6 +15,11 @@ function display_init(&$a) {
 
 function display_content(&$a, $update = 0) {
 
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 	require_once('include/conversation.php');
@@ -37,9 +40,10 @@ function display_content(&$a, $update = 0) {
 
 	if($update) {
 		$item_id = $_REQUEST['item_id'];
+		$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) {
@@ -108,26 +112,29 @@ function display_content(&$a, $update = 0) {
 			'acl' => populate_acl($a->user, $celeb),
 			'bang' => '',
 			'visitor' => 'block',
-			'profile_uid' => local_user()
-		);	
+			'profile_uid' => local_user(),
+			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+		);
 		$o .= status_editor($a,$x,0,true);
 	}
 
 	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	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` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' ))
 		        $sql_extra AND unseen = 1",
 		        intval($a->profile['uid']),
 		        dbesc($item_id),
 		        dbesc($item_id) 
 		);
+
 		if(!$r)
 			return '';
 	}
 
-	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+	$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`
@@ -135,16 +142,46 @@ function display_content(&$a, $update = 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` FORCE INDEX (PRIMARY, `uri`) WHERE ( `id` = '%s' OR `uri` = '%s' )
+		AND uid = %d )
 		$sql_extra
 		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'];
+
+			$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` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+				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` FORCE INDEX (PRIMARY, `uri`) 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 
@@ -159,24 +196,54 @@ function display_content(&$a, $update = 0) {
 			$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
 		$o .= conversation($a,$items,'display', $update);
 
+		// Preparing the meta header
+		require_once('include/bbcode.php');
+		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"];
+
+		if ($title == "")
+			$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="'.$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";
+
+		$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
+
+		$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: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="'.$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 );
+		else {	
+			notice( t('Permission denied.') . EOL ); 
 		}
-
+	}
+	else {
+		notice( t('Item not found.') . EOL );
 	}
 
 	return $o;