Merge pull request #2047 from annando/1511-ostatus-warning

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index f54a76be4c08f3abd8d64d8ed4939a935fc6cb26..f199574c69483945f63f4e632c155aa49ba500d2 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,4 +1,5 @@
 <?php
+require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
 function viewcontacts_init(&$a) {
@@ -12,6 +13,7 @@ function viewcontacts_init(&$a) {
 
 
 function viewcontacts_content(&$a) {
+       require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
@@ -21,7 +23,7 @@ function viewcontacts_content(&$a) {
        if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
                return;
-       } 
+       }
 
 
        $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
@@ -46,7 +48,7 @@ function viewcontacts_content(&$a) {
                if($rr['self'])
                        continue;
 
-           $url = $rr['url'];
+               $url = $rr['url'];
 
                // route DFRN profiles through the redirect
 
@@ -57,28 +59,27 @@ function viewcontacts_content(&$a) {
                else
                        $url = zrl($url);
 
+               $contact_details = get_contact_details_by_url($rr['url'], $a->profile['uid']);
+
                $contacts[] = array(
                        'id' => $rr['id'],
                        'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
-                       'thumb' => $rr['thumb'], 
-                       'name' => substr($rr['name'],0,20),
-                       'username' => $rr['name'],
+                       'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+                       'name' => htmlentities(substr($rr['name'],0,20)),
+                       'username' => htmlentities($rr['name']),
+                       'details'       => $contact_details['location'],
+                        'tags'          => $contact_details['keywords'],
+                        'about'         => $contact_details['about'],
                        'url' => $url,
                        'sparkle' => '',
-                       'itemurl' => $rr['url'],
-                       'network' => network_to_name($rr['network']),
+                       'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+                       'network' => network_to_name($rr['network'], $rr['url']),
                );
        }
 
 
        $tpl = get_markup_template("viewcontact_template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl, $includes + array(
+       $o .= replace_macros($tpl, array(
                '$title' => t('View Contacts'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),