clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2121 from rabuzarus/3011_viewcontactstitle 

make viewcontacts part of the profile tab
This commit is contained in:
Michael Vogel 2015-11-30 23:29:35 +01:00
parent 0278e60664 2ce64c2496
commit 712b3c7593
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Accesskeys.md
View File

@ -19,6 +19,7 @@ General
* v: Videos
* e: Events and Calendar
* t: Personal Notes
* k: View Contacts
/contacts (contact list)
---------

10
include/identity.php
View File

@ -700,6 +700,16 @@ if(! function_exists('profile_tabs')){
);
}
if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
$tabs[] = array(
'label' => t('Contacts'),
'url' => $a->get_baseurl() . '/viewcontacts/' . $nickname,
'sel' => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
'title' => t('Contacts'),
'id' => 'viewcontacts-tab',
'accesskey' => 'k',
);
}
$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
call_hooks('profile_tabs', $arr);

24
mod/viewcontacts.php
View File

@ -8,7 +8,23 @@ function viewcontacts_init(&$a) {
return;
}
profile_load($a,$a->argv[1]);
nav_set_selected('home');
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
$a->data['user'] = $r[0];
$a->profile_uid = $r[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_uid));
profile_load($a,$a->argv[1]);
}
}
@ -25,6 +41,10 @@ function viewcontacts_content(&$a) {
return;
}
$o = "";
// tabs
$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
@ -93,7 +113,7 @@ function viewcontacts_content(&$a) {
$tpl = get_markup_template("viewcontact_template.tpl");
$o .= replace_macros($tpl, array(
'$title' => t('View Contacts'),
'$title' => t('Contacts'),
'$contacts' => $contacts,
'$paginate' => paginate($a),
));