diff options
| author | zottel <github@zottel.net> | 2012-05-01 08:21:12 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-01 08:21:12 +0200 |
| commit | 2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (patch) | |
| tree | 2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17 /mod/settings.php | |
| parent | 43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (diff) | |
| parent | f175af05f92384fab7adb75390a8aa52dc1bd7e1 (diff) | |
| download | volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.gz volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.bz2 volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/settings.php b/mod/settings.php index 3072d3d65..5f5b2ab2e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -352,6 +352,7 @@ function settings_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); + $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0); $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); @@ -436,6 +437,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','suggestme', $suggestme); set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); + set_pconfig(local_user(),'system','post_joingroup', $post_joingroup); set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); @@ -802,6 +804,9 @@ function settings_content(&$a) { $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 + $post_joingroup = get_pconfig(local_user(), 'system','post_joingroup'); + $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0 + $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 @@ -976,6 +981,7 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), '$activity_options' => t('By default post a status message when:'), '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''), + '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, ''), '$post_profilechange' => array('post_profilechange', t('making an <em>interesting</em> profile change'), $post_profilechange, ''), '$lbl_not' => t('Send a notification email when:'), '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), |