wrong verb in dislike activity body

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index c08b0ca92a198da2fed8d0619f1ec1fd78f3200f..de11ec35d65f08836f23d4a5838507fdb604f4f5 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,8 +5,8 @@ function display_content(&$a) {
 
        $o = '<div id="live-display"></div>' . "\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);
 
@@ -142,8 +142,8 @@ 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']))))
                                ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
                                : '<div class="wall-item-lock"></div>');
 
@@ -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,11 +211,14 @@ function display_content(&$a) {
                                }
                        }
 
-                       $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-                       $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+                       $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;
 
-                       if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == local_user()))
+                       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']));
                        else 
                                $drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
@@ -232,19 +235,26 @@ function display_content(&$a) {
                                        $location = '<span class="smalltext">' . $coord . '</span>';
                        }
 
-                       $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'],
+                               '$title' => t('View $name\'s profile'),
                                '$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,
@@ -255,6 +265,12 @@ function display_content(&$a) {
                                '$comment' => $comment
                        ));
 
+                       $arr = array('item' => $item, 'output' => $tmp_item);
+                       call_hooks('display_item', $arr);
+
+                       $o .= $arr['output'];
+
+
                }
        }
        else {