Merge pull request #2213 from annando/1512-dfrn-request

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 3e841d27593b5297e87b1a531390fd5c129cd7d5..a85e498db2ce7ea037eb0c067e367ea3b0287055 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -6,6 +6,8 @@ function network_init(&$a) {
        }
 
        $is_a_date_query = false;
+       if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+               $cid = $_GET['cid'];
 
        if($a->argc > 1) {
                for($x = 1; $x < $a->argc; $x ++) {
@@ -146,20 +148,12 @@ function network_init(&$a) {
        }
 
        $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
-       $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist($a) : '');
+       $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist(local_user(),$cid) : '');
        $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);
        $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
        $a->page['aside'] .= saved_searches($search);
        $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
-//     if(x($_GET['cid']) && intval($_GET['cid']) != 0) {
-//             $r = q("SELECT `url` FROM `contact` WHERE `id` = %d",
-//                     intval($_GET['cid']));
-//             if ($r) {
-//                     $a->page['aside'] = "";
-//                     profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"]));
-//             }
-//     }
 }
 
 function saved_searches($search) {
@@ -318,7 +312,7 @@ function network_content(&$a, $update = 0) {
                return login(false);
        }
 
-       // TODO:is this really necessary? $a is already available to hooks
+       /// @TODO Is this really necessary? $a is already available to hooks
        $arr = array('query' => $a->query_string);
        call_hooks('network_content_init', $arr);
 
@@ -352,8 +346,8 @@ function network_content(&$a, $update = 0) {
        $o = '';
 
        // item filter tabs
-       // TODO: fix this logic, reduce duplication
-       //$a->page['content'] .= '<div class="tabs-wrapper">';
+       /// @TODO fix this logic, reduce duplication
+       /// $a->page['content'] .= '<div class="tabs-wrapper">';
 
        list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
        // if no tabs are selected, defaults to comments
@@ -605,6 +599,7 @@ function network_content(&$a, $update = 0) {
 
                        $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array(
                                'contacts' => $entries,
+                               'id' => 'network',
                        )) . $o;
 
                        if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {