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 f7379d0c8a3d9613fd839592d0b4eee54302107f..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'])) {
@@ -476,6 +483,9 @@ function contacts_content(&$a) {
                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,
@@ -503,7 +513,7 @@ function contacts_content(&$a) {
                        '$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') ),