From b6fe837a643c9c7bb63a5196d4d14c508f3fce55 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 29 May 2012 18:43:56 -0700
Subject: [PATCH] hide private group if desired

---
 mod/dfrn_request.php      | 16 ++++++++++------
 view/dfrn_req_confirm.tpl |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index b809929d7e..896fe17927 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -68,7 +68,7 @@ function dfrn_request_post(&$a) {
 			$dfrn_url    = notags(trim($_POST['dfrn_url']));
 			$aes_allow   = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
 			$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
-
+			$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
 			$contact_record = null;
 	
 			if(x($dfrn_url)) {
@@ -98,8 +98,9 @@ function dfrn_request_post(&$a) {
 				}
 	
 				if(is_array($contact_record)) {
-					$r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1",
+					$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d LIMIT 1",
 						intval($aes_allow),
+						intval($hidden),
 						intval($contact_record['id'])
 					);
 				}
@@ -144,8 +145,8 @@ function dfrn_request_post(&$a) {
 					 */
 
 					$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
-						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`) 
-						VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`) 
+						VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
 						intval(local_user()),
 						datetime_convert(),
 						dbesc($dfrn_url),
@@ -160,7 +161,8 @@ function dfrn_request_post(&$a) {
 						$parms['dfrn-poll'],
 						$parms['dfrn-poco'],
 						dbesc(NETWORK_DFRN),
-						intval($aes_allow)
+						intval($aes_allow),
+						intval($hidden)
 					);
 				}
 
@@ -649,6 +651,8 @@ function dfrn_request_content(&$a) {
 		$o  = replace_macros($tpl,array(
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
+			'$hidethem' => t('Hide this contact'),
+			'$hidechecked' => '',
 			'$confirm_key' => $confirm_key,
 			'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
 			'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
@@ -680,7 +684,7 @@ function dfrn_request_content(&$a) {
 			$auto_confirm = false;
 
 			if(count($r)) {
-				if($r[0]['page-flags'] != PAGE_NORMAL)
+				if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
 					$auto_confirm = true;				
 
 				if(! $auto_confirm) {
diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
index 58e9233aa7..6c916323ce 100644
--- a/view/dfrn_req_confirm.tpl
+++ b/view/dfrn_req_confirm.tpl
@@ -11,6 +11,10 @@ $please
 <input type="hidden" name="localconfirm" value="1" />
 $aes_allow
 
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
+<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
+
+
 <div id="dfrn-request-homecoming-submit-wrapper" >
 <input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
 </div>