Merge branch 'pull'

[friendica.git] / mod / viewcontacts.php

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index c970db33aa5298c2e531faa3533dc174767372f1..cd8d100ed186cca55e85918a50200482705a1565 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -25,35 +25,44 @@ function viewcontacts_content(&$a) {
        $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 ",
                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 ORDER BY `name` ASC LIMIT %d , %d ",
                intval($a->profile['uid']),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
        if(! count($r)) {
-               notice( t('No contacts.') . EOL );
+               info( t('No contacts.') . EOL );
                return $o;
        }
 
-       $tpl = load_view_file("view/viewcontact_template.tpl");
+       $tpl = get_markup_template("viewcontact_template.tpl");
 
        foreach($r as $rr) {
                if($rr['self'])
                        continue;
 
+           $url = $rr['url'];
+
+               // route DFRN profiles through the redirect
+
+               $is_owner = ((local_user() && ($a->profile['profile_uid'] == local_user())) ? true : false);
+
+               if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
+                       $url = 'redir/' . $rr['id'];
+
                $o .= replace_macros($tpl, array(
                        '$id' => $rr['id'],
-                       '$alt_text' => t('Visit $username\'s profile'),
+                       '$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' => $rr['url'] 
+                       '$url' => $url
                ));
        }
 
@@ -62,4 +71,4 @@ function viewcontacts_content(&$a) {
        $o .= paginate($a);
 
        return $o;
-}
\ No newline at end of file
+}