X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=cad60d2754ce5990f7040463633c1b8a3e7a8d64;hb=b358e8afe21443a8f7e14573953a9780ba1d592d;hp=2b721aef8ad944221f6b7fce203039417b73ceae;hpb=511c761fec572a093e833541968635ca011cb71e;p=friendica.git

diff --git a/mod/display.php b/mod/display.php
index 2b721aef8a..cad60d2754 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,8 +3,10 @@
 
 function display_content(&$a) {
 
-	require_once('mod/profile.php');
-	profile_init($a);
+	$o = '<div id="live-display"></div>' . "\r\n";
+
+	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	profile_load($a,$nick);
 
 	$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
 
@@ -57,7 +59,7 @@ function display_content(&$a) {
 
 	// Profile owner - everything is visible
 
-	if(local_user() && (get_uid() == $a->profile['uid'])) {
+	if(local_user() && (local_user() == $a->profile['uid'])) {
 		$sql_extra = ''; 		
 	}
 
@@ -91,7 +93,7 @@ function display_content(&$a) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 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 `type` != 'remote' )
 		$sql_extra
 		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
 		intval($a->profile['uid']),
@@ -100,6 +102,7 @@ function display_content(&$a) {
 	);
 
 
+
 	$cmnt_tpl = load_view_file('view/comment_item.tpl');
 	$like_tpl = load_view_file('view/like.tpl');
 	$tpl = load_view_file('view/wall_item.tpl');
@@ -112,45 +115,35 @@ function display_content(&$a) {
 
 	if(count($r)) {
 
-		foreach($r as $item) {
-			$sparkle = '';
-			if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
-				$url = $item['url'];
-				if(($item['network'] === 'dfrn') && (! $item['self'])) {
-					$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-					$sparkle = ' class="sparkle"';
-				}
-				if(! is_array($alike[$item['parent'] . '-l']))
-					$alike[$item['parent'] . '-l'] = array();
-				$alike[$item['parent']] ++;
-				$alike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-			}
-			if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
-				$url = $item['url'];
-				if(($item['network'] === 'dfrn') && (! $item['self'])) { 
-					$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-					$sparkle = ' class="sparkle"';
-				}
-				if(! is_array($dlike[$item['parent'] . '-l']))
-					$dlike[$item['parent'] . '-l'] = array();
-				$dlike[$item['parent']] ++;
-				$dlike[$item['parent'] . '-l'][] = '<a href="'. $url . '"' . $sparkle . '>' . $item['name'] . '</a>';
-			}
+		if((local_user()) && (local_user() == $a->profile['uid'])) {
+			q("UPDATE `item` SET `unseen` = 0 
+				WHERE `parent` = %d AND `unseen` = 1",
+				intval($r[0]['parent'])
+			);
 		}
 
-
+		foreach($r as $item) {
+			like_puller($a,$item,$alike,'like');
+			like_puller($a,$item,$dlike,'dislike');
+		}
 
 		foreach($r as $item) {
-			$comment = '';
+
 			$template = $tpl;
+
+			$comment     = '';
+			$owner_url   = '';
+			$owner_photo = '';
+			$owner_name  = '';
 			
 			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 			
-			if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
+			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+				&& ($item['id'] != $item['parent']))
 				continue;
 
-			$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
+			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
 				: '<div class="wall-item-lock"></div>');
 
@@ -218,32 +211,50 @@ function display_content(&$a) {
 				}
 			}
 
-			$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+			$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
+
 			$profile_link = $profile_url;
 
-			if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == get_uid()))
+			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
 				$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
 			else 
 				$drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
 
-			$like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+			$like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+
+			$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+			if($coord) {
+				if($location)
+					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+				else
+					$location = '<span class="smalltext">' . $coord . '</span>';
+			}
 
+			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
 
-			$o .= replace_macros($template,array(
+			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+				$indent .= ' shiny'; 
+
+
+			$tmp_item = replace_macros($template,array(
 				'$id' => $item['item_id'],
+				'$title' => t('View $name\'s profile'),
 				'$profile_url' => $profile_link,
 				'$name' => $profile_name,
 				'$sparkle' => $sparkle,
 				'$osparkle' => $osparkle,
 				'$thumb' => $profile_avatar,
 				'$title' => $item['title'],
-				'$body' => bbcode($item['body']),
+				'$body' => smilies(bbcode($item['body'])),
 				'$ago' => relative_date($item['created']),
 				'$lock' => $lock,
-				'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
-				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+				'$location' => $location,
+				'$indent' => $indent,
 				'$owner_url' => $owner_url,
 				'$owner_photo' => $owner_photo,
 				'$owner_name' => $owner_name,
@@ -254,6 +265,12 @@ function display_content(&$a) {
 				'$comment' => $comment
 			));
 
+			$arr = array('item' => $item, 'output' => $tmp_item);
+			call_hooks('display_item', $arr);
+
+			$o .= $arr['output'];
+
+
 		}
 	}
 	else {