]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/emailsettings.php
Ticket #2912: move 'I want to post notices by email" checkbox up from the email ...
[quix0rs-gnu-social.git] / actions / emailsettings.php
index 6138a88f9055ae5af1a58c42cec29ef2595561ac..02b6892e0f151c23dbc4c0c270cd37b1be1a1ac7 100644 (file)
@@ -131,7 +131,11 @@ class EmailsettingsAction extends AccountSettingsAction
                 // TRANS: Field label for e-mail address input in e-mail settings form.
                 $this->input('email', _('Email address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
-                             // TRANS: Instructions for e-mail address input form.
+                             // TRANS: Instructions for e-mail address input form. Do not translate
+                             // TRANS: "example.org". It is one of the domain names reserved for
+                             // TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+                             // TRANS: Any other domain may be owned by a legitimate person or
+                             // TRANS: organization.
                              _('Email address, like "UserName@example.org"'));
                 $this->elementEnd('li');
                 $this->elementEnd('ul');
@@ -145,6 +149,16 @@ class EmailsettingsAction extends AccountSettingsAction
             $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
             // TRANS: Form legend for incoming e-mail settings form.
             $this->element('legend', null, _('Incoming email'));
+
+            $this->elementStart('ul', 'form_data');
+            $this->elementStart('li');
+            $this->checkbox('emailpost',
+                    // TRANS: Checkbox label in e-mail preferences form.
+                    _('I want to post notices by email.'),
+                    $user->emailpost);
+            $this->elementEnd('li');
+            $this->elementEnd('ul');
+
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -174,51 +188,47 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Email preferences'));
 
         $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->checkbox('emailnotifysub',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Send me notices of new subscriptions through email.'),
-                        $user->emailnotifysub);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('emailnotifyfav',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Send me email when someone '.
-                          'adds my notice as a favorite.'),
-                        $user->emailnotifyfav);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('emailnotifymsg',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Send me email when someone sends me a private message.'),
-                        $user->emailnotifymsg);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('emailnotifyattn',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Send me email when someone sends me an "@-reply".'),
-                        $user->emailnotifyattn);
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->checkbox('emailnotifynudge',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Allow friends to nudge me and send me an email.'),
-                        $user->emailnotifynudge);
-        $this->elementEnd('li');
-        if (common_config('emailpost', 'enabled')) {
-            $this->elementStart('li');
-            $this->checkbox('emailpost',
-                            // TRANS: Checkbox label in e-mail preferences form.
-                            _('I want to post notices by email.'),
-                            $user->emailpost);
-            $this->elementEnd('li');
-        }
-        $this->elementStart('li');
-        $this->checkbox('emailmicroid',
-                        // TRANS: Checkbox label in e-mail preferences form.
-                        _('Publish a MicroID for my email address.'),
-                        $user->emailmicroid);
-        $this->elementEnd('li');
+       
+        if (Event::handle('StartEmailFormData', array($this))) {
+           $this->elementStart('li');
+           $this->checkbox('emailnotifysub',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Send me notices of new subscriptions through email.'),
+                           $user->emailnotifysub);
+           $this->elementEnd('li');
+           $this->elementStart('li');
+           $this->checkbox('emailnotifyfav',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Send me email when someone '.
+                             'adds my notice as a favorite.'),
+                           $user->emailnotifyfav);
+           $this->elementEnd('li');
+           $this->elementStart('li');
+           $this->checkbox('emailnotifymsg',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Send me email when someone sends me a private message.'),
+                           $user->emailnotifymsg);
+           $this->elementEnd('li');
+           $this->elementStart('li');
+           $this->checkbox('emailnotifyattn',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Send me email when someone sends me an "@-reply".'),
+                           $user->emailnotifyattn);
+           $this->elementEnd('li');
+           $this->elementStart('li');
+           $this->checkbox('emailnotifynudge',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Allow friends to nudge me and send me an email.'),
+                           $user->emailnotifynudge);
+           $this->elementEnd('li');
+           $this->elementStart('li');
+           $this->checkbox('emailmicroid',
+                           // TRANS: Checkbox label in e-mail preferences form.
+                           _('Publish a MicroID for my email address.'),
+                           $user->emailmicroid);
+           $this->elementEnd('li');
+           Event::handle('EndEmailFormData', array($this));
+       }
         $this->elementEnd('ul');
         // TRANS: Button label to save e-mail preferences.
         $this->submit('save', _m('BUTTON','Save'));
@@ -295,43 +305,48 @@ class EmailsettingsAction extends AccountSettingsAction
 
     function savePreferences()
     {
-        $emailnotifysub   = $this->boolean('emailnotifysub');
-        $emailnotifyfav   = $this->boolean('emailnotifyfav');
-        $emailnotifymsg   = $this->boolean('emailnotifymsg');
-        $emailnotifynudge = $this->boolean('emailnotifynudge');
-        $emailnotifyattn  = $this->boolean('emailnotifyattn');
-        $emailmicroid     = $this->boolean('emailmicroid');
-        $emailpost        = $this->boolean('emailpost');
-
-        $user = common_current_user();
-
-        assert(!is_null($user)); // should already be checked
-
-        $user->query('BEGIN');
-
-        $original = clone($user);
-
-        $user->emailnotifysub   = $emailnotifysub;
-        $user->emailnotifyfav   = $emailnotifyfav;
-        $user->emailnotifymsg   = $emailnotifymsg;
-        $user->emailnotifynudge = $emailnotifynudge;
-        $user->emailnotifyattn  = $emailnotifyattn;
-        $user->emailmicroid     = $emailmicroid;
-        $user->emailpost        = $emailpost;
-
-        $result = $user->update($original);
-
-        if ($result === false) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error thrown on database error updating e-mail preferences.
-            $this->serverError(_('Couldn\'t update user.'));
-            return;
-        }
-
-        $user->query('COMMIT');
-
-        // TRANS: Confirmation message for successful e-mail preferences save.
-        $this->showForm(_('Email preferences saved.'), true);
+       $user = common_current_user();
+       
+       if (Event::handle('StartEmailSaveForm', array($this, &$user))) {
+           
+           $emailnotifysub   = $this->boolean('emailnotifysub');
+           $emailnotifyfav   = $this->boolean('emailnotifyfav');
+           $emailnotifymsg   = $this->boolean('emailnotifymsg');
+           $emailnotifynudge = $this->boolean('emailnotifynudge');
+           $emailnotifyattn  = $this->boolean('emailnotifyattn');
+           $emailmicroid     = $this->boolean('emailmicroid');
+           $emailpost        = $this->boolean('emailpost');
+           
+           assert(!is_null($user)); // should already be checked
+           
+           $user->query('BEGIN');
+           
+           $original = clone($user);
+           
+           $user->emailnotifysub   = $emailnotifysub;
+           $user->emailnotifyfav   = $emailnotifyfav;
+           $user->emailnotifymsg   = $emailnotifymsg;
+           $user->emailnotifynudge = $emailnotifynudge;
+           $user->emailnotifyattn  = $emailnotifyattn;
+           $user->emailmicroid     = $emailmicroid;
+           $user->emailpost        = $emailpost;
+           
+           $result = $user->update($original);
+           
+           if ($result === false) {
+               common_log_db_error($user, 'UPDATE', __FILE__);
+               // TRANS: Server error thrown on database error updating e-mail preferences.
+               $this->serverError(_('Couldn\'t update user.'));
+               return;
+           }
+           
+           $user->query('COMMIT');
+           
+           Event::handle('EndEmailSaveForm', array($this));
+           
+           // TRANS: Confirmation message for successful e-mail preferences save.
+           $this->showForm(_('Email preferences saved.'), true);
+       }
     }
 
     /**