Merge pull request #1453 from annando/ddos-with-gprobe

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 300331a9dcdf19be1f09e992691ca3b3aa98f7f9..95b1944dc871f697f159409f98b77bd782f8bc49 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -32,7 +32,8 @@ function contacts_init(&$a) {
                        $a->data['contact'] = $r[0];
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
                                '$name' => $a->data['contact']['name'],
-                               '$photo' => $a->data['contact']['photo']
+                               '$photo' => $a->data['contact']['photo'],
+                               '$url' => ($a->data['contact']['network'] == 'dfrn') ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
                        ));
                        $follow_widget = '';
        }
@@ -44,6 +45,9 @@ function contacts_init(&$a) {
                        $follow_widget = follow_widget();
        }
 
+       if ($_GET['nets'] == "all")
+               $_GET['nets'] = "";
+
        $groups_widget .= group_side('contacts','group',false,0,$contact_id);
        $findpeople_widget .= findpeople_widget();
        $networks_widget .= networks_widget('contacts',$_GET['nets']);
@@ -402,6 +406,9 @@ function contacts_content(&$a) {
                                break;
                }
 
+               if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
+                               $relation_text = "";
+
                $relation_text = sprintf($relation_text,$contact['name']);
 
                if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
@@ -424,7 +431,7 @@ function contacts_content(&$a) {
 
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
-               $poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false);
+               $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
 
                $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
 
@@ -469,6 +476,16 @@ function contacts_content(&$a) {
 
                $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
+               if ($contact['network'] == NETWORK_FEED)
+                       $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
+                                                                       array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords')));
+
+               if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
+                       $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
+
+               if ($contact['network'] == NETWORK_DFRN)
+                       $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
+
                $o .= replace_macros($tpl, array(
                        '$header' => t('Contact Editor'),
                        '$tab_str' => $tab_str,
@@ -489,14 +506,14 @@ function contacts_content(&$a) {
                        '$lblsuggest' => $lblsuggest,
                        '$delete' => t('Delete contact'),
                        '$nettype' => $nettype,
-                       '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
+                       '$poll_interval' => $poll_interval,
                        '$poll_enabled' => $poll_enabled,
                        '$lastupdtext' => t('Last update:'),
                        '$lost_contact' => $lost_contact,
                        '$updpub' => t('Update public posts'),
                        '$last_update' => $last_update,
                        '$udnow' => t('Update now'),
-                       '$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
+                       '$profile_select' => $profile_select,
                        '$contact_id' => $contact['id'],
                        '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
                        '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
@@ -507,8 +524,7 @@ function contacts_content(&$a) {
                        '$archived' => (($contact['archive']) ? t('Currently archived') : ''),
                        '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts <strong>may</strong> still be visible')),
                        '$notify' => array('notify', t('Notification for new posts'), ($contact['notify_new_posts'] == 1), t('Send a notification of every new post of this contact')),
-                       '$fetch_further_information' => array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
-                                                               array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords'))),
+                       '$fetch_further_information' => $fetch_further_information,
                        '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
                        '$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')),
                        '$photo' => $contact['photo'],