minor edit to last commit

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 6b425bcd1e8d70028ea66c0fb0bab555d0ca9fc6..3703fe7f26c6f49d09dda271295d67fc5edf9a08 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -67,7 +67,7 @@ function profile_init(&$a) {
 }
 
 
-function profile_content(&$a) {
+function profile_content(&$a, $update = false) {
 
        require_once("include/bbcode.php");
        require_once('include/security.php');
@@ -76,14 +76,8 @@ function profile_content(&$a) {
 
        $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()) {
@@ -94,30 +88,64 @@ function profile_content(&$a) {
                $contact_id = $_SESSION['cid'];
        }
 
-       if($tab == 'profile') {
-               require_once('view/profile_advanced.php');
-               return $o;
+       if($update) {
+               // Ensure we've got a profile owner if updating.
+               if(remote_user()) {
+                       $r = q("SELECT `uid` FROM `contact` WHERE `id` = %d LIMIT 1",
+                               intval($_SESSION['visitor_id'])
+                       );
+                       if(count($r))
+                               $a->profile['uid'] = $r[0]['uid'];
+                       else
+                               killme();
+               }
+               elseif(local_user()) {
+                       $a->profile['uid'] = $_SESSION['uid'];
+               }
+               else {
+                       killme();
+                       return; // NOTREACHED
+               }
        }
 
-       if(can_write_wall($a,$a->profile['profile_uid'])) {
-               $tpl = file_get_contents('view/jot-header.tpl');
-       
-               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
-               require_once('view/acl_selectors.php');
+       else {
+               if(x($_GET,'tab'))
+                       $tab = notags(trim($_GET['tab']));
 
-               $tpl = file_get_contents("view/jot.tpl");
+               $tpl = file_get_contents('view/profile_tabs.tpl');
 
                $o .= replace_macros($tpl,array(
-                       '$baseurl' => $a->get_baseurl(),
-                       '$return_path' => $a->cmd,
-                       '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
-                       '$lockstate' => 'unlock',
-                       '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
-                       '$profile_uid' => $a->profile['profile_uid']
+                       '$url' => $a->get_baseurl() . '/' . $a->cmd
                ));
-       }
 
 
+               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');
+       
+                       $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+                       require_once('view/acl_selectors.php');
+
+                       $tpl = file_get_contents("view/jot.tpl");
+
+                       $o .= replace_macros($tpl,array(
+                               '$baseurl' => $a->get_baseurl(),
+                               '$return_path' => $a->cmd,
+                               '$visitor' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? 'block' : 'none'),
+                               '$lockstate' => 'unlock',
+                               '$acl' => (($_SESSION['uid'] == $a->profile['profile_uid']) ? populate_acl() : ''),
+                               '$profile_uid' => $a->profile['profile_uid']
+                       ));
+               }
+
+               if($tab == 'posts' && (! $a->pager['start']))
+                       $o .= '<div id="live-profile"></div>' . "\r\n";
+       }
+
        // TODO alter registration and settings and profile to update contact table when names and  photos change.  
 
        // default permissions - anonymous user
@@ -126,7 +154,7 @@ function profile_content(&$a) {
 
        // Profile owner - everything is visible
 
-       if(local_user() && ($_SESSION['uid'] == $a->profile['profile_uid'])) {
+       if(local_user() && ($_SESSION['uid'] == $a->profile['uid'])) {
                $sql_extra = ''; 
                
                // Oh - while we're here... reset the Unseen messages
@@ -161,7 +189,7 @@ function profile_content(&$a) {
        $r = q("SELECT COUNT(*) AS `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-               AND `item`.`type` != 'remote' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+               AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
                $sql_extra ",
                intval($a->profile['uid'])
 
@@ -177,7 +205,7 @@ function profile_content(&$a) {
                `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 `item`.`type` != 'remote' AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+               AND NOT `item`.`type` IN ( 'remote', 'net-comment') AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                $sql_extra
                ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
                intval($a->profile['uid']),
@@ -191,6 +219,10 @@ function profile_content(&$a) {
 
        $tpl = file_get_contents('view/wall_item.tpl');
 
+       if($update)
+               $return_url = $_SESSION['return_url'];
+       else
+               $return_url = $_SESSION['return_url'] = $a->cmd;
 
        if(count($r)) {
                foreach($r as $item) {
@@ -199,13 +231,16 @@ function profile_content(&$a) {
                        
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
                        
-                       if(can_write_wall($a,$a->profile['profile_uid'])) {
+
+
+                       if(can_write_wall($a,$a->profile['uid'])) {
                                if($item['last-child']) {
                                        $comment = replace_macros($cmnt_tpl,array(
-                                               '$return_path' => $a->cmd,
+                                               '$return_path' => $_SESSION['return_url'],
+                                               '$type' => 'wall-comment',
                                                '$id' => $item['item_id'],
                                                '$parent' => $item['parent'],
-                                               '$profile_uid' =>  $a->profile['profile_uid'],
+                                               '$profile_uid' =>  $a->profile['uid'],
                                                '$ww' => ''
                                        ));
                                }
@@ -234,6 +269,14 @@ function profile_content(&$a) {
                        $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'] == $_SESSION['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,
@@ -242,11 +285,16 @@ function profile_content(&$a) {
                                '$body' => bbcode($item['body']),
                                '$ago' => relative_date($item['created']),
                                '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+                               '$drop' => $drop,
                                '$comment' => $comment
                        ));
                }
        }
 
+       if($update) {
+               return $o;
+       }
+               
        $o .= paginate($a);
 
        return $o;