From 45c2a4868efbf8f457914f87bee8553cc28fa77f Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Mon, 30 Nov 2015 03:25:23 +0100
Subject: [PATCH 1/2] make viewcontacts part of the profile tab

---
 include/identity.php | 10 ++++++++++
 mod/viewcontacts.php | 24 ++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 48fd5056dc..8abcce27c6 100644
--- 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' => 's',
+			);
+		}
 
 		$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 d16a48e349..04520e0d93 100644
--- 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),
 	));

From 2ce64c2496e11fd57aff6ad22bd183840e308d1d Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Mon, 30 Nov 2015 16:23:03 +0100
Subject: [PATCH 2/2] change shortcut for viewcontacts + shortcut docu

---
 doc/Accesskeys.md    | 1 +
 include/identity.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index 0c00c25476..5e25e55c45 100644
--- 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 8abcce27c6..1cd2e6f73a 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -707,7 +707,7 @@ if(! function_exists('profile_tabs')){
 				'sel'	=> ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
 				'title' => t('Contacts'),
 				'id' => 'viewcontacts-tab',
-				'accesskey' => 's',
+				'accesskey' => 'k',
 			);
 		}