Profile block base style

[quix0rs-gnu-social.git] / actions / emailsettings.php

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index c93cbfae0d74e423cd54ba4c1441f3d177abe06a..b35b4d28ee1a28c66b82e46454522c50332e5882 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -88,6 +88,15 @@ class EmailsettingsAction extends SettingsAction {
                common_checkbox('emailnotifysub',
                                _('Send me notices of new subscriptions through email.'),
                                $user->emailnotifysub);
+               common_checkbox('emailnotifyfav',
+                               _('Send me email when someone adds my notice as a favorite.'),
+                               $user->emailnotifyfav);
+               common_checkbox('emailnotifymsg',
+                               _('Send me email when someone sends me a private message.'),
+                               $user->emailnotifymsg);
+               common_checkbox('emailnotifynudge',
+                               _('Allow friends to nudge me and send me an email.'),
+                               $user->emailnotifynudge);
                common_checkbox('emailpost',
                                                _('I want to post notices by email.'),
                                                $user->emailpost);
@@ -142,6 +151,9 @@ class EmailsettingsAction extends SettingsAction {
        function save_preferences() {
 
                $emailnotifysub = $this->boolean('emailnotifysub');
+               $emailnotifyfav = $this->boolean('emailnotifyfav');
+               $emailnotifymsg = $this->boolean('emailnotifymsg');
+               $emailnotifynudge = $this->boolean('emailnotifynudge');
                $emailmicroid = $this->boolean('emailmicroid');
                $emailpost = $this->boolean('emailpost');
 
@@ -154,6 +166,9 @@ class EmailsettingsAction extends SettingsAction {
                $original = clone($user);
 
                $user->emailnotifysub = $emailnotifysub;
+               $user->emailnotifyfav = $emailnotifyfav;
+               $user->emailnotifymsg = $emailnotifymsg;
+               $user->emailnotifynudge = $emailnotifynudge;
                $user->emailmicroid = $emailmicroid;
                $user->emailpost = $emailpost;
 
@@ -214,9 +229,7 @@ class EmailsettingsAction extends SettingsAction {
                        return;
                }
 
-               mail_confirm_address($confirm->code,
-                                                        $user->nickname,
-                                                        $email);
+               mail_confirm_address($user, $confirm->code, $user->nickname, $email);
 
                $msg = _('A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');