salmon protocol changes magicsig draft-experimental, fixes to hostxrd

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 388bf08e6389499de19974567dd7808772b7f32f..4f5a49acd1c7062e0462cf4b66af26d876920390 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -6,14 +6,26 @@ function contacts_init(&$a) {
        if(! local_user())
                return;
 
+       $contact_id = 0;
+       if(($a->argc == 2) && intval($a->argv[1])) {
+               $contact_id = intval($a->argv[1]);
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
+                       intval(local_user()),
+                       intval($contact_id)
+               );
+               if(! count($r)) {
+                       $contact_id = 0;
+               }
+       }
+
        require_once('include/group.php');
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
-       $a->page['aside'] .= group_side();
+       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
 
        $inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
 
-       if(get_config('system','invitations_only')) {
+       if(get_config('system','invitation_only')) {
                $x = get_pconfig(local_user(),'system','invites_remaining');
                if($x || is_site_admin()) {
                        $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
@@ -264,13 +276,6 @@ function contacts_content(&$a) {
                }
 
                $grps = '';
-               $member_of = member_of($r[0]['id']);
-               if(is_array($member_of) && count($member_of)) {
-                       $grps = t('Member of: ') . EOL . '<ul>';
-                       foreach($member_of as $member)
-                               $grps .= '<li><a href="group/' . $member['id'] . '" title="' . t('Edit') . '" ><img src="images/spencil.gif" alt="' . t('Edit') . '" /></a> <a href="network/' . $member['id'] . '">' . $member['name'] . '</a></li>';
-                       $grps .= '</ul>';
-               }
 
                $insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
                        . t('Private communications are not available for this contact.') . '</p></div>';