cache result of (expensive) security check for visitor rights

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index b451d693009bb1e4e41ad165fc5ed570854b0a88..aa945536172c7741c9bef2c608cdb00bd4849209 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -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 `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']),
@@ -128,8 +128,13 @@ function display_content(&$a) {
                }
 
                foreach($r as $item) {
-                       $comment = '';
+
                        $template = $tpl;
+
+                       $comment     = '';
+                       $owner_url   = '';
+                       $owner_photo = '';
+                       $owner_name  = '';
                        
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
                        
@@ -206,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) {