style tabs

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index b37d6487ccbd26b97d0d702894e887aa742152ef..0e9bb6ff61ef33d56d9de0eb01aadfc05cfe1173 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -58,21 +58,33 @@ function profile_init(&$a) {
        }
 
        profile_load($a,$which);
+       $a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
        
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
        foreach($dfrn_pages as $dfrn)
                $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+
 }
 
-function item_display($item,$template) {
+function item_display(&$a, $item,$template,$comment) {
+
+
+       $profile_url = $item['url'];
+
+       if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
+               $profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+       $photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
+       $thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
 
        $o .= replace_macros($template,array(
                '$id' => $item['item_id'],
-               '$profile_url' => $item['url'],
+               '$profile_url' => $profile_url,
                '$name' => $item['name'],
-               '$thumb' => $item['thumb'],
+               '$thumb' => $thumb,
                '$body' => bbcode($item['body']),
-               '$ago' => relative_date($item['created'])
+               '$ago' => relative_date($item['created']),
+               '$comment' => $comment
        ));
 
 
@@ -86,9 +98,34 @@ function profile_content(&$a) {
        require_once("include/bbcode.php");
        require_once('include/security.php');
 
-//     $tpl = file_get_contents('view/profile_tabs.tpl');
+       $tab = 'posts';
+
+       if(x($_GET,'tab'))
+               $tab = notags(trim($_GET['tab']));
+
+       $tpl = file_get_contents('view/profile_tabs.tpl');
+
+       $o .= replace_macros($tpl,array(
+               '$url' => $a->get_baseurl() . '/' . $a->cmd
+       ));
+
 
+       if(remote_user())
+               $contact_id = $_SESSION['visitor_id'];
+       if(local_user()) {
+               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                       $_SESSION['uid']
+               );
+               if(count($r))
+                       $contact_id = $r[0]['id'];
+       }
+
+       if($tab == 'profile') {
+
+               require_once('view/profile_advanced.php');
 
+               return $o;
+       }
        if(can_write_wall($a,$a->profile['profile_uid'])) {
                $tpl = file_get_contents('view/jot-header.tpl');
        
@@ -111,7 +148,8 @@ function profile_content(&$a) {
 
                // Add comments. 
 
-               $r = q("SELECT `item`.*, `contact`.`name`, `contact`.`photo`, `contact`.`thumb`, `contact`.`id` AS `cid`
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `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 `contact`.`blocked` = 0
@@ -121,11 +159,26 @@ function profile_content(&$a) {
                        intval($a->profile['uid'])
                );
 
+               $template = file_get_contents('view/comment_item.tpl');
+
+
+
+
                $tpl = file_get_contents('view/wall_item.tpl');
 
                if(count($r)) {
                        foreach($r as $rr) {
-                               $o .= item_display($rr,$tpl);
+                               if(can_write_wall($a,$a->profile['profile_uid'])) {
+                                       $comment = replace_macros($template,array(
+                                               '$id' => $rr['item_id'],
+                                               '$profile_uid' =>  $a->profile['profile_uid']
+                                       ));
+                               }
+                               else {
+                                       $comment = '';
+                               }
+
+                               $o .= item_display($a,$rr,$tpl,$comment);
                        }
                }
        }