Merge pull request #2121 from rabuzarus/3011_viewcontactstitle

make viewcontacts part of the profile tab

diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index 0c00c25476f55c617375ede6d0ba80fe989d7ace..5e25e55c45124d85e93421fc93bc1d8d79d44a72 100644 (file)
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@ -19,6 +19,7 @@ General
 * v: Videos
 * e: Events and Calendar
 * t: Personal Notes
+* k: View Contacts
 
 /contacts (contact list)
 ---------

diff --git a/include/identity.php b/include/identity.php
index 48fd5056dc98a10a85b3c97ad1156d956b8fa988..1cd2e6f73ace74f81a350e38999e742f24b86c73 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -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);

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index d16a48e349190f447ac0d3cbf4087ea088f3e164..04520e0d9309cc163ffe86c165625ef0e96233cd 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -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),
        ));