Merge pull request #1947 from annando/1510-diaspora-follower

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 89154eded9ce0437177db0546a2ef515022c401e..c562c9822da0f0664476ab42567e11b222666986 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -33,7 +33,7 @@ function contacts_init(&$a) {
        if($contact_id) {
                        $a->data['contact'] = $r[0];
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
-                               '$name' => $a->data['contact']['name'],
+                               '$name' => htmlentities($a->data['contact']['name']),
                                '$photo' => $a->data['contact']['photo'],
                                '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
                        ));
@@ -238,12 +238,12 @@ function _contact_update_profile($contact_id) {
 
        $data = probe_url($r[0]["url"]);
 
-       // "Feed" is mostly a sign of communication problems
-       if (($data["network"] == NETWORK_FEED) AND ($data["network"] != $r[0]["network"]))
+       // "Feed" or "Unknown" is mostly a sign of communication problems
+       if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
                return;
 
        $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
-                               "poco", "network", "alias", "pubkey");
+                               "poco", "network", "alias");
        $update = array();
 
        if ($data["network"] == NETWORK_OSTATUS) {
@@ -432,7 +432,7 @@ function contacts_content(&$a) {
                                }
 
                                $a->page['aside'] = '';
-                               
+
                                return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
                                        '$contact' =>  _contact_detail_for_template($orig_record[0]),
                                        '$method' => 'get',
@@ -509,7 +509,7 @@ function contacts_content(&$a) {
                if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
                                $relation_text = "";
 
-               $relation_text = sprintf($relation_text,$contact['name']);
+               $relation_text = sprintf($relation_text,htmlentities($contact['name']));
 
                if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
                        $url = "redir/{$contact['id']}";
@@ -590,6 +590,10 @@ function contacts_content(&$a) {
                if ($contact['network'] == NETWORK_DFRN)
                        $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
 
+               if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
+                       ($contact['rel'] == CONTACT_IS_FOLLOWER))
+                       $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+
                $o .= replace_macros($tpl, array(
                        '$header' => t('Contact Editor'),
                        '$tab_str' => $tab_str,
@@ -617,6 +621,8 @@ function contacts_content(&$a) {
                        '$updpub' => t('Update public posts'),
                        '$last_update' => $last_update,
                        '$udnow' => t('Update now'),
+                       '$follow' => $follow,
+                       '$follow_text' => t("Connect/Follow"),
                        '$profile_select' => $profile_select,
                        '$contact_id' => $contact['id'],
                        '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
@@ -632,7 +638,7 @@ function contacts_content(&$a) {
                        '$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'],
-                       '$name' => $contact['name'],
+                       '$name' => htmlentities($contact['name']),
                        '$dir_icon' => $dir_icon,
                        '$alt_text' => $alt_text,
                        '$sparkle' => $sparkle,
@@ -832,8 +838,8 @@ function _contact_detail_for_template($rr){
                $url = $rr['url'];
                $sparkle = '';
        }
-       
-       
+
+
        return array(
                'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
                'edit_hover' => t('Edit contact'),
@@ -841,9 +847,9 @@ function _contact_detail_for_template($rr){
                'id' => $rr['id'],
                'alt_text' => $alt_text,
                'dir_icon' => $dir_icon,
-               'thumb' => proxy_url($rr['thumb']),
-               'name' => $rr['name'],
-               'username' => $rr['name'],
+               'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+               'name' => htmlentities($rr['name']),
+               'username' => htmlentities($rr['name']),
                'sparkle' => $sparkle,
                'itemurl' => $rr['url'],
                'url' => $url,