Merge pull request #1937 from annando/1510-follow-notifications

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
old mode 100755 (executable)
new mode 100644 (file)
index 6b66f60..b848567
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -13,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;
@@ -21,16 +23,16 @@ 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 ",
+       $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 AND `hidden` = 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'])
@@ -54,17 +56,19 @@ function viewcontacts_content(&$a) {
 
                if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
                        $url = 'redir/' . $rr['id'];
+               else
+                       $url = zrl($url);
 
                $contacts[] = array(
                        'id' => $rr['id'],
                        'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
-                       'thumb' => $rr['thumb'], 
+                       'thumb' => proxy_url($rr['thumb']),
                        'name' => substr($rr['name'],0,20),
                        'username' => $rr['name'],
                        'url' => $url,
                        'sparkle' => '',
                        'itemurl' => $rr['url'],
-                       'network' => network_to_name($rr['network']),
+                       'network' => network_to_name($rr['network'], $rr['url']),
                );
        }