X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdisplay.php;h=096ea16c9b7d432b3de449008866e7c8ddd0d482;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=aa945536172c7741c9bef2c608cdb00bd4849209;hpb=f9f018ef083acb554003def1fc186bfc3102acc0;p=friendica.git
diff --git a/mod/display.php b/mod/display.php
index aa94553617..096ea16c9b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,8 +5,8 @@ function display_content(&$a) {
$o = '
' . "\r\n";
- require_once('mod/profile.php');
- profile_init($a);
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ profile_load($a,$nick);
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@@ -93,7 +93,7 @@ function display_content(&$a) {
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ) AND `type` != 'remote' )
+ AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
intval($a->profile['uid']),
@@ -127,6 +127,8 @@ function display_content(&$a) {
like_puller($a,$item,$dlike,'dislike');
}
+ $author_contacts = extract_item_authors($r,$a->profile['uid']);
+
foreach($r as $item) {
$template = $tpl;
@@ -142,18 +144,24 @@ function display_content(&$a) {
&& ($item['id'] != $item['parent']))
continue;
- $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
- || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+ $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']));
+ $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'],
@@ -171,14 +179,6 @@ function display_content(&$a) {
$sparkle = '';
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
- if(($item['network'] === 'dfrn') && (! $item['self'] )) {
- $profile_url = $redirect_url;
- $sparkle = ' sparkle';
- }
-
-
// Top-level wall post not written by the wall owner (wall-to-wall)
// First figure out who owns it.
@@ -202,7 +202,7 @@ 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['network'] === 'dfrn')) {
+ if((link_compare($item['owner-link'],$item['url'])) && ($item['network'] === 'dfrn')) {
$owner_url = $redirect_url;
$osparkle = ' sparkle';
}
@@ -211,15 +211,27 @@ function display_content(&$a) {
}
}
- $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+ $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;
+ // Can we use our special contact URL for this author?
+
+ 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';
+ }
+ }
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']));
+ $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']));
@@ -235,22 +247,34 @@ function display_content(&$a) {
$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'),
+ '$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']),
'$lock' => $lock,
'$location' => $location,
- '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+ '$indent' => $indent,
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
'$owner_name' => $owner_name,
+ '$plink' => get_plink($item),
'$drop' => $drop,
'$vote' => $likebuttons,
'$like' => $like,
@@ -258,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 {
@@ -278,6 +308,9 @@ function display_content(&$a) {
}
}
+
+ $o .= '';
+
return $o;
}