From 32cd62ff0a69cbce29617ac943dbcb580e395b67 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 18:15:46 -0700
Subject: [PATCH] allow setting default new friend notify

---
 mod/notifications.php |  2 +-
 mod/settings.php      | 10 ++++++++++
 view/settings.tpl     |  7 ++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 4e268188e..8e3eebba1 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -198,7 +198,7 @@ function notifications_content(&$a) {
 					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
-					'$activity' => array('activity', t('Post a new friend activity'), 0, t('if applicable')),
+					'$activity' => array('activity', t('Post a new friend activity'), get_config('system','post_newfriend'), t('if applicable')),
 					'$url' => zrl($rr['url']),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
diff --git a/mod/settings.php b/mod/settings.php
index 2dd9fb9a6..12af99560 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -346,6 +346,7 @@ function settings_post(&$a) {
 	$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
 	$hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
 	$hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
+	$post_newfriend   = (($_POST['post_newfriend'] == 1) ? 1: 0);
 
 
 	$notify = 0;
@@ -428,6 +429,7 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'expire','photos', $expire_photos);
 
 	set_pconfig(local_user(),'system','suggestme', $suggestme);
+	set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
 
 
 	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d  WHERE `uid` = %d LIMIT 1",
@@ -790,6 +792,8 @@ function settings_content(&$a) {
 	$suggestme = get_pconfig(local_user(), 'system','suggestme');
 	$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
 
+	$post_newfriend = get_pconfig(local_user(), 'system','post_newfriend');
+	$post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
 
 	
 	if(! strlen($a->user['timezone']))
@@ -877,6 +881,10 @@ function settings_content(&$a) {
 
 	));
 
+	$activity_options = t('By default post a status message when:');
+
+	$post_newfriend = array('post_newfriend',  t('accepting a friend request'), $post_newfriend, '');
+
 
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
@@ -958,6 +966,8 @@ function settings_content(&$a) {
 		
 		
 		'$h_not' 	=> t('Notification Settings'),
+		'$activity_options' => $activity_options,
+		'$post_newfriend' => $post_newfriend,
 		'$lbl_not' 	=> t('Send a notification email when:'),
 		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
 		'$notify2'	=> array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
diff --git a/view/settings.tpl b/view/settings.tpl
index ebca4875f..081f56306 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -99,7 +99,12 @@ $unkmail
 
 <h3 class="settings-heading">$h_not</h3>
 
-<div id="settings-notify-desc">$lbl_not </div>
+<strong>$activity_options</strong>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+
+
+<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}