X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fprofile.php;h=c0989bd28a253dc43a17aeeb462b4b3c7b457098;hb=47f0abf27e2aa0f5443badd2a43617b922662bba;hp=46d13298e004e6eb22c35f1401be1f6c41f4437d;hpb=af0fe4cf422aee9a8fd6b5b5cd422ed0c02e6696;p=friendica.git
diff --git a/mod/profile.php b/mod/profile.php
index 46d13298e0..c0989bd28a 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'] .= '';
+ }
if(x($a->profile,'openidserver'))
$a->page['htmlhead'] .= '' . "\r\n";
if(x($a->profile,'openid')) {
@@ -25,6 +28,11 @@ function profile_init(&$a) {
$a->page['htmlhead'] .= '' . "\r\n";
}
+ $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+ $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+ if(strlen($keywords))
+ $a->page['htmlhead'] .= '' . "\r\n" ;
+
$a->page['htmlhead'] .= '' . "\r\n" ;
$a->page['htmlhead'] .= '' . "\r\n" ;
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
@@ -144,6 +152,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 +267,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 +310,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(
@@ -339,13 +367,13 @@ function profile_content(&$a, $update = 0) {
if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
$dropping = true;
- $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id']));
+ $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
$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']) ? '' . $item['location'] . '' : '');
- $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
+ $location = (($item['location']) ? '' . $item['location'] . '' : '');
+ $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
if($coord) {
if($location)
$location .= '
(' . $coord . ')';
@@ -360,7 +388,7 @@ function profile_content(&$a, $update = 0) {
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
- '$title' => t('View $name\'s profile'),
+ '$linktitle' => t('View $name\'s profile'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,