diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
| commit | 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa (patch) | |
| tree | 1cb3cb621221e948be9e0e91916aac0dd6fccb0e /mod/settings.php | |
| parent | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.gz volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.bz2 volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mod/settings.php b/mod/settings.php index 2dd9fb9a6..721468437 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -346,6 +346,8 @@ 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); + $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); $notify = 0; @@ -428,6 +430,8 @@ 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); + set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); $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 +794,11 @@ 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 + + $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); + $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 if(! strlen($a->user['timezone'])) @@ -878,6 +887,8 @@ function settings_content(&$a) { )); + + $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) ? true : false); @@ -958,6 +969,9 @@ 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_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, ''), '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''), |