X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fviewcontacts.php;h=a6bf74b2885df20042a8de26186029a12db00917;hb=ddaacc1e5334cab25855bb1b73b59b4436877765;hp=90ff85b9dbd4476c3534a6138b108f1d6608d613;hpb=b4f2aac7e76d8d8a8330ade4116a015593f001a6;p=friendica.git
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 90ff85b9db..a6bf74b288 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,56 +1,85 @@
argv[1]);
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ return;
+ }
+ profile_load($a,$a->argv[1]);
}
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;
+ }
+
if(((! count($a->profile)) || ($a->profile['hide-friends']))) {
notice( t('Permission denied.') . EOL);
return;
- }
-
- $o .= '
' . t('View Contacts') . '
';
+ }
- $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'])
);
if(! count($r)) {
- notice( t('No contacts.') . EOL );
+ info( t('No contacts.') . EOL );
return $o;
}
- $tpl = load_view_file("view/viewcontact_template.tpl");
+ $contacts = array();
foreach($r as $rr) {
if($rr['self'])
continue;
- $o .= replace_macros($tpl, array(
- '$id' => $rr['id'],
- '$alt_text' => t('Visit ') . $rr['name'] . t('\'s profile'),
- '$thumb' => $rr['thumb'],
- '$name' => substr($rr['name'],0,20),
- '$url' => $rr['url']
- ));
+ $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'];
+ 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 .= '';
- $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;
-}
\ No newline at end of file
+}