X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=e272674354506bec4c20c2c0af12b007ab23b03b;hb=6edc52f78f12f366f344eb86723d39b92a77a9ff;hp=afa61ef026022256304d3e846b2bb9f7b25ea594;hpb=66e8e91646bb2e75881cab0085b4165bbe8e8fc9;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index afa61ef026..e272674354 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,7 +1,19 @@
 <?php
 
 
-function display_content(&$a) {
+function display_init(&$a) {
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		return;
+	}
+
+	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	profile_load($a,$nick);
+
+}
+
+
+function display_content(&$a, $update = 0) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
@@ -14,15 +26,25 @@ function display_content(&$a) {
 	require_once('include/acl_selectors.php');
 
 
-	$o = '<div id="live-display"></div>' . "\r\n";
+	$o = '';
 
-	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
+	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
 
 
-	$nick = (($a->argc > 1) ? $a->argv[1] : '');
-	profile_load($a,$nick);
+	if($update) {
+		$nick = $_REQUEST['nick'];
+	}
+	else {
+		$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	}
 
-	$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 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);
+	}
 
 	if(! $item_id) {
 		$a->error = 404;
@@ -35,8 +57,18 @@ function display_content(&$a) {
 	$contact = null;
 	$remote_contact = false;
 
-	if(remote_user()) {
-		$contact_id = $_SESSION['visitor_id'];
+	$contact_id = 0;
+
+	if(is_array($_SESSION['remote'])) {
+		foreach($_SESSION['remote'] as $v) {
+			if($v['uid'] == $a->profile['uid']) {
+				$contact_id = $v['cid'];
+				break;
+			}
+		}
+	}
+
+	if($contact_id) {
 		$groups = init_groups_visitor($contact_id);
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($contact_id),
@@ -68,7 +100,7 @@ function display_content(&$a) {
 		return;
 	}
 	
-	if ($is_owner)
+	if ($is_owner) {
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
 		$x = array(
@@ -80,13 +112,28 @@ function display_content(&$a) {
 			'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' ))
+		        $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`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
@@ -114,8 +161,36 @@ function display_content(&$a) {
 		}
 
 		$items = conv_sort($r,"`commented`");
-		
-		$o .= conversation($a,$items,'display', false);
+
+		if(!$update)
+			$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));
+
+		if ($title == "")
+			$title = $r[0]["author-name"];
+
+		//<meta name="keywords" content="">
+		$a->page['htmlhead'] .= '<meta name="author" content="'.$r[0]["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="'.$r[0]["author-name"].'" />'."\n";
+		// article:tag
 
 	}
 	else {