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 4baa2d2d7c7ec24bf552240857db2e00064a0e54..4f5a49acd1c7062e0462cf4b66af26d876920390 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,16 +3,42 @@
 require_once('include/Contact.php');
 
 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','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">' 
+                       . sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
+                       . '</div>' . $inv;
+               }
+       }
+       elseif($a->config['register_policy'] != REGISTER_CLOSED)
+               $a->page['aside'] .= $inv;
 
-       if($a->config['register_policy'] != REGISTER_CLOSED)
-               $a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
 
-       if(strlen(get_config('system','directory_submit_url')))
-               $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' . t('Find People With Shared Interests') . '</a></div>';
+       $a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
+               . t('Find People With Shared Interests') . '</a></div>';
 
        $tpl = get_markup_template('follow.tpl');
        $a->page['aside'] .= replace_macros($tpl,array(
@@ -249,6 +275,8 @@ function contacts_content(&$a) {
                        $sparkle = '';
                }
 
+               $grps = '';
+
                $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>';
 
@@ -259,6 +287,10 @@ function contacts_content(&$a) {
                if($r[0]['last-update'] !== '0000-00-00 00:00:00')
                        $last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
 
+               $lblsuggest = (($r[0]['network'] === NETWORK_DFRN) 
+                       ? '<div id="contact-suggest-wrapper"><a href="fsuggest/' . $r[0]['id'] . '" id="contact-suggest">' . t('Suggest friends') . '</a></div>' : '');
+
+
                $o .= replace_macros($tpl,array(
                        '$header' => t('Contact Editor'),
                        '$submit' => t('Submit'),
@@ -275,6 +307,8 @@ function contacts_content(&$a) {
                        '$altcrepair' => t('Repair contact URL settings'),
                        '$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
                        '$lblrecent' => t('View conversations'),
+                       '$lblsuggest' => $lblsuggest,
+                       '$grps' => $grps,
                        '$delete' => t('Delete contact'),
                        '$poll_interval' => contact_poll_interval($r[0]['priority']),
                        '$lastupdtext' => t('Last updated: '),