OpenID delegation in profile page

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 2e35cd6acc5f2fc4c15015f468068424aba72913..990d0b431b06acdda54c0e390840f77989ab5250 100644 (file)
--- 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 = '<div id="live-display"></div>' . "\r\n";
+
+       $nick = (($a->argc > 1) ? $a->argv[1] : '');
+       profile_load($a,$nick);
 
        $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
 
@@ -91,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 `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ) AND `type` != 'remote' )
                $sql_extra
                ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
                intval($a->profile['uid']),
@@ -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,14 +115,26 @@ function display_content(&$a) {
 
        if(count($r)) {
 
+               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');
                }
 
                foreach($r as $item) {
-                       $comment = '';
+
                        $template = $tpl;
+
+                       $comment     = '';
+                       $owner_url   = '';
+                       $owner_photo = '';
+                       $owner_name  = '';
                        
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
                        
@@ -127,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>');
 
@@ -196,17 +211,21 @@ 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 = (($item['url'] !== $item['author-link']) ? true : false);
+
+                       $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']));
 
-                       $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']) : '');
+                       $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']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
                        $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
                        if($coord) {
@@ -216,6 +235,12 @@ function display_content(&$a) {
                                        $location = '<span class="smalltext">' . $coord . '</span>';
                        }
 
+                       $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(
                                '$id' => $item['item_id'],
                                '$profile_url' => $profile_link,
@@ -224,11 +249,11 @@ function display_content(&$a) {
                                '$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,