X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=096ea16c9b7d432b3de449008866e7c8ddd0d482;hb=0d161c6ef60e4bcfe36f0a9b1e090955156a162a;hp=f695dc20552ac6026958b97ff8f00510250891a4;hpb=34eedb503acad59d649f96d3250b40cc1c84047c;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index f695dc2055..096ea16c9b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,8 +3,10 @@
function display_content(&$a) {
- require_once('mod/profile.php');
- profile_init($a);
+ $o = '' . "\r\n";
+
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ profile_load($a,$nick);
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@@ -57,7 +59,7 @@ function display_content(&$a) {
// Profile owner - everything is visible
- if(local_user() && (get_uid() == $a->profile['uid'])) {
+ if(local_user() && (local_user() == $a->profile['uid'])) {
$sql_extra = '';
}
@@ -85,8 +87,8 @@ function display_content(&$a) {
}
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`,
- `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `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
@@ -100,6 +102,7 @@ function display_content(&$a) {
);
+
$cmnt_tpl = load_view_file('view/comment_item.tpl');
$like_tpl = load_view_file('view/like.tpl');
$tpl = load_view_file('view/wall_item.tpl');
@@ -112,49 +115,59 @@ function display_content(&$a) {
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'][] = '' . $item['name'] . '';
- }
- 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'][] = '' . $item['name'] . '';
- }
+ if((local_user()) && (local_user() == $a->profile['uid'])) {
+ q("UPDATE `item` SET `unseen` = 0
+ WHERE `parent` = %d AND `unseen` = 1",
+ intval($r[0]['parent'])
+ );
}
+ foreach($r as $item) {
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
+ }
+ $author_contacts = extract_item_authors($r,$a->profile['uid']);
foreach($r as $item) {
- $comment = '';
+
$template = $tpl;
+
+ $comment = '';
+ $owner_url = '';
+ $owner_photo = '';
+ $owner_name = '';
$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['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+ ? ''
+ : '');
+
if(can_write_wall($a,$a->profile['uid'])) {
+ if($item['id'] == $item['parent']) {
+ $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']) {
$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'],
'$profile_uid' => $a->profile['uid'],
'$mylink' => $contact['url'],
- '$mytitle' => t('Me'),
+ '$mytitle' => t('This is you'),
'$myphoto' => $contact['thumb'],
'$ww' => ''
));
@@ -163,14 +176,14 @@ function display_content(&$a) {
$profile_url = $item['url'];
-
-
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ $sparkle = '';
// 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') {
@@ -189,45 +202,79 @@ function display_content(&$a) {
$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))
- $owner_url = $redirect_url;
+ if((link_compare($item['owner-link'],$item['url'])) && ($item['network'] === 'dfrn')) {
$owner_url = $redirect_url;
+ $osparkle = ' sparkle';
+ }
+
}
}
- $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
- $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
- $profile_link = $profile_url;
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
- $drop = '';
+ $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']);
- if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == get_uid()))
- $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+ // Can we use our special contact URL for this author?
- $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']) : '');
+ 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';
+ }
+ elseif(isset($author_contacts[$item['author-link']])) {
+ $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+ $sparkle = ' sparkle';
+ }
+ }
- $likebuttons = '';
- if($item['id'] == $item['parent']) {
- $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+ if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+ else
+ $drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
+
+ $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'] . '' : '');
+ if($coord) {
+ if($location)
+ $location .= '
(' . $coord . ')';
+ else
+ $location = '' . $coord . '';
}
+ $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';
- $o .= replace_macros($template,array(
+ $tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
+ '$linktitle' => t('View $name\'s profile'),
+ '$olinktitle' => t('View $owner_name\'s profile'),
+ '$to' => t('to'),
+ '$wall' => t('Wall-to-Wall'),
+ '$vwall' => t('via Wall-To-Wall:'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
+ '$sparkle' => $sparkle,
+ '$osparkle' => $osparkle,
'$thumb' => $profile_avatar,
'$title' => $item['title'],
- '$body' => bbcode($item['body']),
+ '$body' => smilies(bbcode($item['body'])),
'$ago' => relative_date($item['created']),
- '$location' => (($item['location']) ? '' . $item['location'] . '' : ''),
- '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+ '$lock' => $lock,
+ '$location' => $location,
+ '$indent' => $indent,
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
'$owner_name' => $owner_name,
+ '$plink' => get_plink($item),
'$drop' => $drop,
'$vote' => $likebuttons,
'$like' => $like,
@@ -235,6 +282,12 @@ function display_content(&$a) {
'$comment' => $comment
));
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $o .= $arr['output'];
+
+
}
}
else {
@@ -255,6 +308,9 @@ function display_content(&$a) {
}
}
+
+ $o .= '';
+
return $o;
}
