]> git.mxchange.org Git - friendica.git/blobdiff - mod/display.php
Merge pull request #161 from tobiasd/master
[friendica.git] / mod / display.php
index 2125e169631ab38eb6d2096747a8a4da9a7433d9..52a84e755e1dd0802b5d8e578c6447c0185fe921 100644 (file)
@@ -3,8 +3,20 @@
 
 function display_content(&$a) {
 
-       require_once('mod/profile.php');
-       profile_init($a);
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
+       require_once("include/bbcode.php");
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+
+
+       $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);
 
@@ -14,15 +26,8 @@ function display_content(&$a) {
                return;
        }
 
-       require_once("include/bbcode.php");
-       require_once('include/security.php');
-
-
        $groups = array();
 
-       $tab = 'posts';
-
-
        $contact = null;
        $remote_contact = false;
 
@@ -46,153 +51,71 @@ function display_content(&$a) {
                }
        }
 
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+               intval($a->profile['uid'])
+       );
+       if(count($r))
+               $a->page_contact = $r[0];
 
-       $sql_extra = "
-               AND `allow_cid` = '' 
-               AND `allow_gid` = '' 
-               AND `deny_cid`  = '' 
-               AND `deny_gid`  = '' 
-       ";
-
-
-       // Profile owner - everything is visible
+       $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if(local_user() && (get_uid() == $a->profile['uid'])) {
-               $sql_extra = '';                
+       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+               notice( t('Access to this profile has been restricted.') . EOL);
+               return;
        }
 
-       // authenticated visitor - here lie dragons
-       // If $remotecontact is true, we know that not only is this a remotely authenticated
-       // person, but that it is *our* contact, which is important in multi-user mode.
-
-       elseif($remote_contact) {
-               $gs = '<<>>'; // should be impossible to match
-               if(count($groups)) {
-                       foreach($groups as $g)
-                               $gs .= '|<' . intval($g) . '>';
-               } 
-               $sql_extra = sprintf(
-                       " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) 
-                         AND ( `deny_cid`  = '' OR  NOT `deny_cid` REGEXP '<%d>' ) 
-                         AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
-                         AND ( `deny_gid`  = '' OR NOT `deny_gid` REGEXP '%s') ",
-
-                       intval($_SESSION['visitor_id']),
-                       intval($_SESSION['visitor_id']),
-                       dbesc($gs),
-                       dbesc($gs)
-               );
-       }
+       $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
        $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`.`writable`, 
                `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
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-               AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE `id` = %d )
+               AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
                $sql_extra
-               ORDER BY `parent` DESC, `id` ASC ",
+               ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
                intval($a->profile['uid']),
-               intval($item_id)
+               dbesc($item_id),
+               dbesc($item_id)
        );
 
 
-       $cmnt_tpl = file_get_contents('view/comment_item.tpl');
-
-       $tpl = file_get_contents('view/wall_item.tpl');
-
-       $return_url = $_SESSION['return_url'] = $a->cmd;
-
        if(count($r)) {
-               foreach($r as $item) {
-                       $comment = '';
-                       $template = $tpl;
-                       
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-                       
-
-                       if(can_write_wall($a,$a->profile['uid'])) {
-                               if($item['last-child']) {
-                                       $comment = replace_macros($cmnt_tpl,array(
-                                               '$return_path' => $_SESSION['return_url'],
-                                               '$type' => 'wall-comment',
-                                               '$id' => $item['item_id'],
-                                               '$parent' => $item['parent'],
-                                               '$profile_uid' =>  $a->profile['uid'],
-                                               '$mylink' => $contact['url'],
-                                               '$mytitle' => t('Me'),
-                                               '$myphoto' => $contact['thumb'],
-                                               '$ww' => ''
-                                       ));
-                               }
-                       }
-
-
-                       $profile_url = $item['url'];
-
-
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+               if((local_user()) && (local_user() == $a->profile['uid'])) {
+                       q("UPDATE `item` SET `unseen` = 0 
+                               WHERE `parent` = %d AND `unseen` = 1",
+                               intval($r[0]['parent'])
+                       );
+               }
 
-                       // Top-level wall post not written by the wall owner (wall-to-wall)
-                       // First figure out who owns it. 
 
-                       if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
-                               
-                               if($item['type'] == 'wall') {
-                                       // I do. Put me on the left of the wall-to-wall notice.
-                                       $owner_url = $a->contact['url'];
-                                       $owner_photo = $a->contact['thumb'];
-                                       $owner_name = $a->contact['name'];
-                                       $template = $wallwall;
-                                       $commentww = 'ww';      
-                               }
-                               if($item['type'] == 'remote' && ($item['owner-link'] != $item['author-link'])) {
-                                       // Could be anybody. 
-                                       $owner_url = $item['owner-link'];
-                                       $owner_photo = $item['owner-avatar'];
-                                       $owner_name = $item['owner-name'];
-                                       $template = $wallwall;
-                                       $commentww = 'ww';
-                                       // If it is our contact, use a friendly redirect link
-                                       if(($item['owner-link'] == $item['url']) && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH))
-                                               $owner_url = $redirect_url;
-                                               $owner_url = $redirect_url;
+               $o .= conversation($a,$r,'display', false);
 
-                               }
+       }
+       else {
+               $r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+                       dbesc($item_id),
+                       dbesc($item_id)
+               );
+               if(count($r)) {
+                       if($r[0]['deleted']) {
+                               notice( t('Item has been removed.') . EOL );
                        }
-
-
-
-
-                       $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;
-
-                       $drop = '';
-
-                       if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == get_uid()))
-                               $drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
-
-
-                       $o .= replace_macros($template,array(
-                               '$id' => $item['item_id'],
-                               '$profile_url' => $profile_link,
-                               '$name' => $profile_name,
-                               '$thumb' => $profile_avatar,
-                               '$title' => $item['title'],
-                               '$body' => bbcode($item['body']),
-                               '$ago' => relative_date($item['created']),
-                               '$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
-                               '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
-                               '$drop' => $drop,
-                               '$comment' => $comment
-                       ));
-                       
+                       else {  
+                               notice( t('Permission denied.') . EOL ); 
+                       }
+               }
+               else {
+                       notice( t('Item not found.') . EOL );
                }
+
        }
 
+       $o .= cc_license();
+
        return $o;
-}
\ No newline at end of file
+}
+