X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=32c7216d44e62638a2bda53f6916e22a17cb65a7;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=92dc986080bbcb6cecb29fa6f9a833a56e977089;hpb=7f1f18675cb545ff92f9a2dedf83ce9a8f0964b2;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 92dc986080..32c7216d44 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -87,6 +87,17 @@ function network_content(&$a, $update = 0) {
 
 		$o .= replace_macros($tpl,array(
 			'$return_path' => $a->cmd,
+			'$action' => 'item',
+			'$share' => t('Share'),
+			'$upload' => t('Upload photo'),
+			'$weblink' => t('Insert web link'),
+			'$youtube' => t('Insert YouTube video'),
+			'$setloc' => t('Set your location'),
+			'$noloc' => t('Clear browser location'),
+			'$wait' => t('Please wait'),
+			'$permset' => t('Permission settings'),
+			'$content' => '',
+			'$post_id' => '',
 			'$baseurl' => $a->get_baseurl(),
 			'$defloc' => $a->user['default-location'],
 			'$visitor' => 'block',
@@ -233,8 +244,8 @@ function network_content(&$a, $update = 0) {
 
 				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-				if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
-					if(($item['network'] === 'dfrn') && (! $item['self'])) {
+				if(strlen($item['author-link'])) {
+					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
 						$profile_link = $redirect_url;
 						$sparkle = ' sparkle';
 					}
@@ -242,11 +253,10 @@ function network_content(&$a, $update = 0) {
 						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
 						$sparkle = ' sparkle';
 					}
-
 				}
 
-				$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>' : '');
+				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 				if($coord) {
 					if($location)
 						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
@@ -350,7 +360,12 @@ function network_content(&$a, $update = 0) {
 
 			$likebuttons = '';
 			if($item['id'] == $item['parent']) {
-				$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+				$likebuttons = replace_macros($like_tpl,array(
+					'$id' => $item['id'],
+					'$likethis' => t("I like this \x28toggle\x29"),
+					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$wait' => t('Please wait') 
+				));
 			}
 
 			if($item['last-child']) {
@@ -380,8 +395,9 @@ function network_content(&$a, $update = 0) {
 			$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);
 
-			if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
-				if(($item['network'] === 'dfrn') && (! $item['self'])) {
+			if(strlen($item['author-link'])) {
+				$profile_link = $item['author-link'];
+				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
 					$profile_link = $redirect_url;
 					$sparkle = ' sparkle';
 				}
@@ -389,8 +405,6 @@ function network_content(&$a, $update = 0) {
 					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
 					$sparkle = ' sparkle';
 				}
-				else
-					$profile_link = $item['author-link'];
 			}
 			else 
 				$profile_link = $item['url'];
@@ -398,8 +412,8 @@ function network_content(&$a, $update = 0) {
 			$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>' : '');
+			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 			if($coord) {
 				if($location)
 					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';