X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=6e781f4fa3df418a53b08afb9a2a5011b7bfc9b2;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=fa267fee21644c062ced231d4bcd76e3e2cb20cb;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index fa267fee21..6e781f4fa3 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -3,6 +3,8 @@
 
 function network_init(&$a) {
 	require_once('include/group.php');
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
 	$a->page['aside'] .= group_side('network','network');
 }
 
@@ -10,7 +12,9 @@ function network_init(&$a) {
 function network_content(&$a, $update = 0) {
 
 	if(! local_user())
-		return;
+		return '';
+
+	$o = '';
 
 	require_once("include/bbcode.php");
 
@@ -28,11 +32,16 @@ function network_content(&$a, $update = 0) {
 		}
 		$_SESSION['return_url'] = $a->cmd;
 
+		$geotag = (($a->user['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+
 		$tpl = load_view_file('view/jot-header.tpl');
 	
-		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$geotag' => $geotag
+		));
 
-		require_once('view/acl_selectors.php');
+		require_once('include/acl_selectors.php');
 
 		$tpl = load_view_file("view/jot.tpl");
 		
@@ -41,13 +50,15 @@ function network_content(&$a, $update = 0) {
 			else
 				$lockstate = 'unlock';
 
+		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
 		$o .= replace_macros($tpl,array(
 			'$return_path' => $a->cmd,
 			'$baseurl' => $a->get_baseurl(),
 			'$defloc' => $a->user['default-location'],
 			'$visitor' => 'block',
 			'$lockstate' => $lockstate,
-			'$acl' => populate_acl(($group) ? $group_acl : $a->user),
+			'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
 			'$bang' => (($group) ? '!' : ''),
 			'$profile_uid' => $_SESSION['uid']
 		));
@@ -111,7 +122,7 @@ function network_content(&$a, $update = 0) {
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
+		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`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
@@ -133,26 +144,10 @@ function network_content(&$a, $update = 0) {
 	$dlike = array();
 	
 	if(count($r)) {
-		foreach($r as $item) {
 
-			if(($item['verb'] == ACTIVITY_LIKE) && ($item['id'] != $item['parent'])) {
-				$url = $item['url'];
-				if(($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self'])) 
-					$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-				if(! is_array($alike[$item['parent'] . '-l']))
-					$alike[$item['parent'] . '-l'] = array();
-				$alike[$item['parent']] ++;
-				$alike[$item['parent'] . '-l'][] = '<a href="'. $url . '">' . $item['name'] . '</a>';
-			}
-			if(($item['verb'] == ACTIVITY_DISLIKE) && ($item['id'] != $item['parent'])) {
-				$url = $item['url'];
-				if(($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self'])) 
-					$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
-				if(! is_array($dlike[$item['parent'] . '-l']))
-					$dlike[$item['parent'] . '-l'] = array();
-				$dlike[$item['parent']] ++;
-				$dlike[$item['parent'] . '-l'][] = '<a href="'. $url . '">' . $item['name'] . '</a>';
-			}
+		foreach($r as $item) {
+			like_puller($a,$item,$alike,'like');
+			like_puller($a,$item,$dlike,'dislike');
 		}
 
 		foreach($r as $item) {
@@ -160,19 +155,28 @@ function network_content(&$a, $update = 0) {
 			$comment = '';
 			$template = $tpl;
 			$commentww = '';
+			$owner_url = $owner_photo = $owner_name = '';
 
 			$profile_url = $item['url'];
+
 			$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'] == 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>');
+
 			// Top-level wall post not written by the wall owner (wall-to-wall)
 			// First figure out who owns it. 
 
+			$osparkle = '';
+
 			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
 
-				if($item['type'] == 'wall') {
+				if($item['type'] === 'wall') {
 					// I do. Put me on the left of the wall-to-wall notice.
 					$owner_url = $a->contact['url'];
 					$owner_photo = $a->contact['thumb'];
@@ -180,7 +184,7 @@ function network_content(&$a, $update = 0) {
 					$template = $wallwall;
 					$commentww = 'ww';	
 				}
-				if($item['type'] == 'remote' && ($item['owner-link'] != $item['author-link'])) {
+				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
 					// Could be anybody. 
 					$owner_url = $item['owner-link'];
 					$owner_photo = $item['owner-avatar'];
@@ -188,8 +192,11 @@ function network_content(&$a, $update = 0) {
 					$template = $wallwall;
 					$commentww = 'ww';
 					// If it is our contact, use a friendly redirect link
-					if(($item['owner-link'] == $item['url']) && ($item['rel'] == REL_VIP || $item['rel'] == REL_BUD))
+					if(($item['owner-link'] == $item['url']) 
+						&& ($item['network'] === 'dfrn')) {
 						$owner_url = $redirect_url;
+						$osparkle = ' sparkle';
+					}
 
 				}
 			}
@@ -212,43 +219,59 @@ function network_content(&$a, $update = 0) {
 					'$parent' => $item['parent'],
 					'$profile_uid' =>  $_SESSION['uid'],
 					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('Me'),
+					'$mytitle' => t('This is you'),
 					'$myphoto' => $a->contact['thumb'],
 					'$ww' => $commentww
 				));
 			}
 
-
 			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
 
 
 	
-			if(($item['rel'] == REL_VIP || $item['rel'] == REL_BUD) && (! $item['self'] ))
+			if(($item['network'] === 'dfrn') && (! $item['self'] )) {
 				$profile_url = $redirect_url;
+				$sparkle = ' sparkle';
+			}
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
 
 			// Post was remotely authored.
 
-			$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $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'] : $thumb);
+
 
 			$profile_link = $profile_url;
 
 			// Can we use our special contact URL for this author? 
 
 			if(strlen($item['author-link'])) {
-				if($item['author-link'] == $item['url'])
+				if($item['author-link'] == $item['url'] && ($item['network'] === 'dfrn') && (! $item['self'])) {
 					$profile_link = $redirect_url;
-				else
+					$sparkle = ' sparkle';
+				}
+				else {
 					$profile_link = $item['author-link'];
+					$sparkle = '';
+				}
 			}
 
 
-			$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    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((x($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>';
+			}
 
 			// Build the HTML
 
@@ -257,10 +280,13 @@ function network_content(&$a, $update = 0) {
 				'$profile_url' => $profile_link,
 				'$name' => $profile_name,
 				'$thumb' => $profile_avatar,
+				'$osparkle' => $osparkle,
+				'$sparkle' => $sparkle,
 				'$title' => $item['title'],
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
-				'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
+				'$lock' => $lock,
+				'$location' => $location,
 				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 				'$owner_url' => $owner_url,
 				'$owner_photo' => $owner_photo,