'
: '');
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(
- '$return_path' => $_SESSION['return_url'],
+ '$return_path' => '',
+ '$jsreload' => '', // $_SESSION['return_url'],
'$type' => 'wall-comment',
'$id' => $item['item_id'],
'$parent' => $item['parent'],
@@ -325,7 +345,7 @@ function profile_content(&$a, $update = 0) {
$profile_url = $item['url'];
- // This is my profile but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
+ // This is my profile page but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
// I can go directly to their profile as an authenticated guest.
if(local_user() && ($item['contact-uid'] == $_SESSION['uid'])
@@ -336,12 +356,23 @@ function profile_content(&$a, $update = 0) {
else
$sparkle = '';
- // We received this post via a remote feed. It's either a wall-to-wall or a remote comment. The author is
- // known to us and is reflected in the contact-id for this item. We can use the contact url or redirect rather than
- // use the link in the feed. This is different than on the network page where we may not know the author.
-
- $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
- $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+
+ $edpost = '';
+ if((local_user()) && ($a->profile['profile_uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1))
+ $edpost = '';
+
+
+ // 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
+ // local contact info at all. In this module you should never encounter a third-party author, but we still will do
+ // the right thing if you ever do.
+
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+ $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;
$drop = '';
@@ -350,13 +381,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 . ')';
@@ -364,24 +395,37 @@ function profile_content(&$a, $update = 0) {
$location = '' . $coord . '';
}
- $o .= replace_macros($template,array(
+ $indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
+
+ 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'],
+ '$linktitle' => t('View $name\'s profile'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,
'$sparkle' => $sparkle,
'$title' => $item['title'],
- '$body' => bbcode($item['body']),
+ '$body' => smilies(bbcode($item['body'])),
'$ago' => relative_date($item['created']),
'$lock' => $lock,
'$location' => $location,
- '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+ '$indent' => $indent,
+ '$plink' => get_plink($item),
+ '$edpost' => $edpost,
'$drop' => $drop,
'$like' => $like,
'$vote' => $likebuttons,
'$dislike' => $dislike,
'$comment' => $comment
));
+
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $o .= $arr['output'];
}
}
@@ -391,6 +435,8 @@ function profile_content(&$a, $update = 0) {
}
$o .= paginate($a);
+ $o .= '
';
+
+
+ // 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
+ // local contact info at all. In this module you should never encounter a third-party author, but we still will do
+ // the right thing if you ever do.
+
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+ $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;
$drop = '';
@@ -350,13 +381,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 .= '