fixed zero uid in imported contact photo

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 845a6bb77f55bff4fc5331a57c8dfc8250449696..2d385a1ddac014592d771f975c47ac41392f7f1d 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -2,11 +2,12 @@
 
 
 function network_init(&$a) {
-
+       require_once('include/group.php');
+       $a->page['aside'] .= group_side('network','network');
 }
 
 
-function network_content(&$a) {
+function network_content(&$a, $update = false) {
 
        if(! local_user())
                return;
@@ -15,32 +16,79 @@ function network_content(&$a) {
 
        $contact_id = $a->cid;
 
-       $r = q("UPDATE `item` SET `unseen` = 0 
-               WHERE `unseen` = 1 AND `uid` = %d",
-               intval($_SESSION['uid'])
-       );
+       $group = 0;
+
+       if(! $update) {
+                       // pull out the group here because the updater might have different args
+               if($a->argc > 1)
+                       $group = intval($a->argv[1]);
 
+               $_SESSION['return_url'] = $a->cmd;
 
-       $tpl = file_get_contents('view/jot-header.tpl');
+               $tpl = file_get_contents('view/jot-header.tpl');
        
-       $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+
+               require_once('view/acl_selectors.php');
 
-       require_once('view/acl_selectors.php');
+               $tpl = file_get_contents("view/jot.tpl");
 
-       $tpl = file_get_contents("view/jot.tpl");
+               $o .= replace_macros($tpl,array(
+                       '$return_path' => $a->cmd,
+                       '$baseurl' => $a->get_baseurl(),
+                       '$visitor' => 'block',
+                       '$lockstate' => 'unlock',
+                       '$acl' => populate_acl(),
+                       '$profile_uid' => $_SESSION['uid']
+               ));
+
+
+               // The special div is needed for liveUpdate to kick in for this page.
+               // We only launch liveUpdate if you are on the front page, you aren't
+               // filtering by group and also you aren't writing a comment (the last
+               // criteria is discovered in javascript).
+
+               if($a->pager['start'] == 0 && $a->argc == 1)
+                       $o .= '<div id="live-network"></div>' . "\r\n";
+       }
+
+       // We aren't going to try and figure out at the item, group, and page level 
+       // which items you've seen and which you haven't. You're looking at some
+       // subset of items, so just mark everything seen. 
+       
+       $r = q("UPDATE `item` SET `unseen` = 0 
+               WHERE `unseen` = 1 AND `uid` = %d",
+               intval($_SESSION['uid'])
+       );
 
-       $o .= replace_macros($tpl,array(
-               '$return_path' => $a->cmd,
-               '$baseurl' => $a->get_baseurl(),
-               '$visitor' => 'block',
-               '$lockstate' => 'unlock',
-               '$acl' => populate_acl(),
-               '$profile_uid' => $_SESSION['uid']
-       ));
+       // We don't have to deal with ACL's on this page. You're looking at everything
+       // that belongs to you, hence you can see all of it. We will filter by group if
+       // desired. 
 
+       // TODO: Perhaps we should limit the group filter to those with the group in the ACL,
+       // rather than just the contact-id of the post.
+       // Otherwise we're not showing complete conversations, unless all the conversants
+       // happen to be in the group.
 
        $sql_extra = ''; 
 
+       if($group) {
+               $r = q("SELECT `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($group),
+                       intval($_SESSION['uid'])
+               );
+               if(! count($r)) {
+                       notice("No such group");
+                       goaway($a->get_baseurl() . '/network');
+                       return; // NOTREACHED
+               }
+
+               $contacts = expand_groups(array($group));
+               $contacts[] = $_SESSION['cid'];
+               $contact_str = implode(',',$contacts);
+               $sql_extra = dbesc(" AND `contact`.`id` IN ( $contact_str ) ");
+
+       }
 
        $r = q("SELECT COUNT(*) AS `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -111,9 +159,16 @@ function network_content(&$a) {
                                }
                        }
 
+                       if($update)
+                               $return_url = $_SESSION['return_url'];
+                       else
+                               $return_url = $_SESSION['return_url'] = $a->cmd;
+
+
                        if($item['last-child']) {
                                $comment = replace_macros($cmnt_tpl,array(
-                                       '$return_path' => $a->cmd,
+                                       '$return_path' => $_SESSION['return_url'],
+                                       '$type' => 'net-comment',
                                        '$id' => $item['item_id'],
                                        '$parent' => $item['parent'],
                                        '$profile_uid' =>  $_SESSION['uid'],
@@ -121,6 +176,10 @@ function network_content(&$a) {
                                ));
                        }
 
+
+                       $drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+
+
        
                        if(($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
                                $profile_url = $redirect_url;
@@ -151,16 +210,21 @@ function network_content(&$a) {
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,
+                               '$title' => $item['title'],
                                '$body' => bbcode($item['body']),
                                '$ago' => relative_date($item['created']),
-                               '$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
+                               '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
                                '$owner_url' => $owner_url,
                                '$owner_photo' => $owner_photo,
                                '$owner_name' => $owner_name,
+                               '$drop' => $drop,
                                '$comment' => $comment
                        ));
                }
        }
-       $o .= paginate($a);
+
+       if(! $update)
+               $o .= paginate($a);
+
        return $o;
 }
\ No newline at end of file