X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=634388fdddbdf41acae10d679719d45148c5d869;hb=d5c45aae43a23e026cf7dad2cf9063d101f93b63;hp=3554708156431468c72793c4cfaf3f8d41060377;hpb=e019a55a83b70684f629bcd179ec938d735b4a57;p=quix0rs-gnu-social.git

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 3554708156..634388fddd 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
 /**
  * Settings for email
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @see      Widget
  */
 
-class EmailsettingsAction extends SettingsAction
+class EmailsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
@@ -95,22 +95,22 @@ class EmailsettingsAction extends SettingsAction
         $this->hidden('token', common_session_token());
 
         if ($user->email) {
-            $this->element('p', array('id' => 'email_confirmed', $user->email));
+            $this->element('p', array('id' => 'form_confirmed'), $user->email);
             $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
             $this->hidden('email', $user->email);
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
-                $this->element('p', array('class' => 'form_note'), 
+                $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address);
+                $this->element('p', array('class' => 'form_note'),
                                         _('Awaiting confirmation on this address. '.
                                         'Check your inbox (and spam box!) for a message '.
                                         'with further instructions.'));
                 $this->hidden('email', $confirm->address);
                 $this->submit('cancel', _('Cancel'));
             } else {
-                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
                 $this->input('email', _('Email Address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
@@ -143,11 +143,10 @@ class EmailsettingsAction extends SettingsAction
             $this->elementEnd('fieldset');
         }
 
-
         $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
@@ -165,6 +164,11 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailnotifymsg);
         $this->elementEnd('li');
         $this->elementStart('li');
+        $this->checkbox('emailnotifyattn',
+                        _('Send me email when someone sends me an "@-reply".'),
+                        $user->emailnotifyattn);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifynudge',
                         _('Allow friends to nudge me and send me an email.'),
                         $user->emailnotifynudge);
@@ -256,6 +260,7 @@ class EmailsettingsAction extends SettingsAction
         $emailnotifyfav   = $this->boolean('emailnotifyfav');
         $emailnotifymsg   = $this->boolean('emailnotifymsg');
         $emailnotifynudge = $this->boolean('emailnotifynudge');
+        $emailnotifyattn  = $this->boolean('emailnotifyattn');
         $emailmicroid     = $this->boolean('emailmicroid');
         $emailpost        = $this->boolean('emailpost');
 
@@ -271,6 +276,7 @@ class EmailsettingsAction extends SettingsAction
         $user->emailnotifyfav   = $emailnotifyfav;
         $user->emailnotifymsg   = $emailnotifymsg;
         $user->emailnotifynudge = $emailnotifynudge;
+        $user->emailnotifyattn  = $emailnotifyattn;
         $user->emailmicroid     = $emailmicroid;
         $user->emailpost        = $emailpost;