Merge develop into manage

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index f9510bd6b43af52f6eb0d23fce5514ba14acaaaf..a6bf74b2885df20042a8de26186029a12db00917 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,4 +1,5 @@
 <?php
+require_once('include/contact_selectors.php');
 
 function viewcontacts_init(&$a) {
 
@@ -12,6 +13,8 @@ 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);
                return;
@@ -20,18 +23,16 @@ function viewcontacts_content(&$a) {
        if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
                notice( t('Permission denied.') . EOL);
                return;
-       } 
-
-       $o .= '<h3>' . t('View Contacts') . '</h3>';
+       }
 
 
-       $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0",
+       $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
                intval($a->profile['uid'])
        );
        if(count($r))
                $a->set_pager_total($r[0]['total']);
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 ORDER BY `name` ASC LIMIT %d , %d ",
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY `name` ASC LIMIT %d , %d ",
                intval($a->profile['uid']),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
@@ -41,7 +42,7 @@ function viewcontacts_content(&$a) {
                return $o;
        }
 
-       $tpl = get_markup_template("viewcontact_template.tpl");
+       $contacts = array();
 
        foreach($r as $rr) {
                if($rr['self'])
@@ -55,20 +56,30 @@ function viewcontacts_content(&$a) {
 
                if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
                        $url = 'redir/' . $rr['id'];
-
-               $o .= replace_macros($tpl, array(
-                       '$id' => $rr['id'],
-                       '$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
-                       '$thumb' => $rr['thumb'], 
-                       '$name' => substr($rr['name'],0,20),
-                       '$username' => $rr['name'],
-                       '$url' => $url
-               ));
+               else
+                       $url = zrl($url);
+
+               $contacts[] = array(
+                       'id' => $rr['id'],
+                       'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
+                       'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+                       'name' => htmlentities(substr($rr['name'],0,20)),
+                       'username' => htmlentities($rr['name']),
+                       'url' => $url,
+                       'sparkle' => '',
+                       'itemurl' => $rr['url'],
+                       'network' => network_to_name($rr['network'], $rr['url']),
+               );
        }
 
-       $o .= '<div id="view-contact-end"></div>';
 
-       $o .= paginate($a);
+       $tpl = get_markup_template("viewcontact_template.tpl");
+       $o .= replace_macros($tpl, array(
+               '$title' => t('View Contacts'),
+               '$contacts' => $contacts,
+               '$paginate' => paginate($a),
+       ));
+
 
        return $o;
 }