X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=4b5f92a1fc0614ae49396918f03d5d6a6d3bbfee;hb=ee11a74d0b7cff5061a4d498f8ecd15e55b91b07;hp=15a3a861f969d36028799d1323af508fb3b96597;hpb=d2c47924eb186a0839fe107b271ccbf27d15fe10;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index 15a3a861f9..4b5f92a1fc 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -18,6 +18,9 @@ function profile_init(&$a) {
 
 	profile_load($a,$which,$profile);
 
+	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] & PAGE_COMMUNITY)) {
+		$a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+	}
 	if(x($a->profile,'openidserver'))				
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
 	if(x($a->profile,'openid')) {
@@ -25,6 +28,11 @@ function profile_init(&$a) {
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 
+	$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+	$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+	if(strlen($keywords))
+		$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
@@ -90,7 +98,10 @@ function profile_content(&$a, $update = 0) {
 
 		$o .= replace_macros($tpl,array(
 			'$url' => $a->get_baseurl() . '/' . $a->cmd,
-			'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname']
+			'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
+			'$status' => t('Status'),
+			'$profile' => t('Profile'),
+			'$photos' => t('Photos')
 		));
 
 
@@ -122,7 +133,12 @@ function profile_content(&$a, $update = 0) {
 			$a->page['htmlhead'] .= replace_macros($tpl, array(
 				'$baseurl' => $a->get_baseurl(),
 				'$geotag'  => $geotag,
-				'$nickname' => $a->profile['nickname']
+				'$nickname' => $a->profile['nickname'],
+				'$linkurl' => t('Please enter a link URL:'),
+				'$utubeurl' => t('Please enter a YouTube link:'),
+				'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
+				'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+				'$whereareu' => t('Where are you right now?') 
 			));
 
 			require_once('include/acl_selectors.php');
@@ -144,6 +160,19 @@ function profile_content(&$a, $update = 0) {
 
 			$o .= replace_macros($tpl,array(
 				'$baseurl' => $a->get_baseurl(),
+				'$action' => 'item',
+				'$share' => t('Share'),
+				'$upload' => t('Upload photo'),
+				'$weblink' => t('Insert web link'),
+				'$youtube' => t('Insert YouTube video'),
+				'$video' => t('Insert Vorbis [.ogg] video'),
+				'$audio' => t('Insert Vorbis [.ogg] audio'),
+				'$setloc' => t('Set your location'),
+				'$noloc' => t('Clear browser location'),
+				'$wait' => t('Please wait'),
+				'$permset' => t('Permission settings'),
+				'$content' => '',
+				'$post_id' => '',
 				'$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
 				'$return_path' => $a->cmd,
 				'$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
@@ -246,6 +275,7 @@ function profile_content(&$a, $update = 0) {
 	$cmnt_tpl = load_view_file('view/comment_item.tpl');
 
 	$like_tpl = load_view_file('view/like.tpl');
+	$noshare_tpl = load_view_file('view/like_noshare.tpl');
 
 	$tpl = load_view_file('view/wall_item.tpl');
 
@@ -288,7 +318,13 @@ function profile_content(&$a, $update = 0) {
 
 			if(can_write_wall($a,$a->profile['profile_uid'])) {
 				if($item['id'] == $item['parent']) {
-					$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+						'$id' => $item['id'],
+						'$likethis' => t("I like this \x28toggle\x29"),
+						'$nolike' => t("I don't like this \x28toggle\x29"),
+						'$share' => t('Share'),
+						'$wait' => t('Please wait') 
+					));
 				}
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
@@ -320,6 +356,12 @@ function profile_content(&$a, $update = 0) {
 			else
 				$sparkle = '';
 
+
+			$edpost = '';
+			if((local_user()) && ($a->profile['profile_uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
+
+
 			// We would prefer to use our own avatar link for this item because the one in the author-avatar might reference a 
 			// remote site (which could be down). We will use author-avatar if we haven't got something stored locally.
 			// We use this same logic block in mod/network.php to determine it this is a third party post and we don't have any 
@@ -344,8 +386,8 @@ function profile_content(&$a, $update = 0) {
 
 			$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>' : '');
+			$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>';
@@ -372,6 +414,7 @@ function profile_content(&$a, $update = 0) {
 				'$location' => $location, 
 				'$indent' => $indent, 
 				'$plink' => get_plink($item),
+				'$edpost' => $edpost,
 				'$drop' => $drop,
 				'$like' => $like,
 				'$vote' => $likebuttons,