summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/emailsettings.php12
-rw-r--r--actions/profilesettings.php15
2 files changed, 26 insertions, 1 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 72bad8519..5e2c06bbd 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -87,7 +87,13 @@ class EmailsettingsAction extends SettingsAction {
common_checkbox('emailnotifysub',
_('Send me notices of new subscriptions through email.'),
$user->emailnotifysub);
-
+ common_checkbox('emailpost',
+ _('I want to post notices by email.'),
+ $user->emailpost);
+ common_checkbox('emailmicroid',
+ _('Publish a MicroID for my email address.'),
+ $user->emailmicroid);
+
common_submit('save', _('Save'));
common_element_end('form');
@@ -128,6 +134,8 @@ class EmailsettingsAction extends SettingsAction {
function save_preferences() {
$emailnotifysub = $this->boolean('emailnotifysub');
+ $emailmicroid = $this->boolean('emailmicroid');
+ $emailpost = $this->boolean('emailpost');
$user = common_current_user();
@@ -138,6 +146,8 @@ class EmailsettingsAction extends SettingsAction {
$original = clone($user);
$user->emailnotifysub = $emailnotifysub;
+ $user->emailmicroid = $emailmicroid;
+ $user->emailpost = $emailpost;
$result = $user->update($original);
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index cfa4db0d7..f2fe89826 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -52,6 +52,18 @@ class ProfilesettingsAction extends SettingsAction {
common_input('location', _('Location'),
($this->arg('location')) ? $this->arg('location') : $profile->location,
_('Where you are, like "City, State (or Region), Country"'));
+
+ $language = common_language();
+ common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
+ $timezone = common_timezone();
+ $timezones = array();
+ foreach(DateTimeZone::listIdentifiers() as $k => $v) {
+ $timezones[$v] = $v;
+ }
+ common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
+
+ common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
+ ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
common_submit('submit', _('Save'));
common_element_end('form');
common_show_footer();
@@ -64,6 +76,9 @@ class ProfilesettingsAction extends SettingsAction {
$homepage = $this->trimmed('homepage');
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
+ $autosubscribe = $this->boolean('autosubscribe');
+ $language = $this->trimmed('language');
+ $timezone = $this->trimmed('timezone');
# Some validation