Twitter-compatible API - removed debugging statement

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

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4fb1c17099b26d75d0a9dad7f6f758bdde45ae88..6e189a909d4a4c585cce158fa74a796a007a0b1f 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class ImsettingsAction extends SettingsAction {
+class EmailsettingsAction extends SettingsAction {
 
        function get_instructions() {
                return _('Manage how you get email from %%site.name%%.');
@@ -34,6 +34,7 @@ class ImsettingsAction extends SettingsAction {
                                                                                   'id' => 'emailsettings',
                                                                                   'action' =>
                                                                                   common_local_url('emailsettings')));
+               common_hidden('token', common_session_token());
 
                common_element('h2', NULL, _('Address'));
 
@@ -63,14 +64,45 @@ class ImsettingsAction extends SettingsAction {
                        }
                }
 
+               if ($user->email) {
+                       common_element('h2', NULL, _('Incoming email'));
+                       
+                       if ($user->incomingemail) {
+                               common_element_start('p');
+                               common_element('span', 'address', $user->incomingemail);
+                               common_element('span', 'input_instructions',
+                                                          _('Send email to this address to post new notices.'));
+                               common_element_end('p');
+                               common_submit('removeincoming', _('Remove'));
+                       }
+                       
+                       common_element_start('p');
+                       common_element('span', 'input_instructions',
+                                                  _('Make a new email address for posting to; cancels the old one.'));
+                       common_element_end('p');
+                       common_submit('newincoming', _('New'));
+               }
+               
                common_element('h2', NULL, _('Preferences'));
 
                common_checkbox('emailnotifysub',
                                _('Send me notices of new subscriptions through email.'),
                                $user->emailnotifysub);
-               
-               common_submit('save', _('Save'));
+               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('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');
                common_show_footer();
        }
@@ -89,6 +121,13 @@ class ImsettingsAction extends SettingsAction {
 
        function handle_post() {
 
+               # CSRF protection
+               $token = $this->trimmed('token');
+               if (!$token || $token != common_session_token()) {
+                       $this->show_form(_('There was a problem with your session token. Try again, please.'));
+                       return;
+               }
+
                if ($this->arg('save')) {
                        $this->save_preferences();
                } else if ($this->arg('add')) {
@@ -97,6 +136,10 @@ class ImsettingsAction extends SettingsAction {
                        $this->cancel_confirmation();
                } else if ($this->arg('remove')) {
                        $this->remove_address();
+               } else if ($this->arg('removeincoming')) {
+                       $this->remove_incoming();
+               } else if ($this->arg('newincoming')) {
+                       $this->new_incoming();
                } else {
                        $this->show_form(_('Unexpected form submission.'));
                }
@@ -105,6 +148,10 @@ class ImsettingsAction extends SettingsAction {
        function save_preferences() {
 
                $emailnotifysub = $this->boolean('emailnotifysub');
+               $emailnotifyfav = $this->boolean('emailnotifyfav');
+               $emailnotifymsg = $this->boolean('emailnotifymsg');
+               $emailmicroid = $this->boolean('emailmicroid');
+               $emailpost = $this->boolean('emailpost');
 
                $user = common_current_user();
 
@@ -115,6 +162,10 @@ class ImsettingsAction extends SettingsAction {
                $original = clone($user);
 
                $user->emailnotifysub = $emailnotifysub;
+               $user->emailnotifyfav = $emailnotifyfav;
+               $user->emailnotifymsg = $emailnotifymsg;
+               $user->emailmicroid = $emailmicroid;
+               $user->emailpost = $emailpost;
 
                $result = $user->update($original);
 
@@ -142,7 +193,7 @@ class ImsettingsAction extends SettingsAction {
                        return;
                }
 
-               $email = common_normalize_email($email);
+               $email = common_canonical_email($email);
 
                if (!$email) {
                    $this->show_form(_('Cannot normalize that email address'));
@@ -173,6 +224,10 @@ class ImsettingsAction extends SettingsAction {
                        return;
                }
 
+               mail_confirm_address($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.');
 
                $this->show_form($msg, TRUE);
@@ -224,11 +279,42 @@ class ImsettingsAction extends SettingsAction {
                }
                $user->query('COMMIT');
 
-               # XXX: unsubscribe to the old address
-
                $this->show_form(_('The address was removed.'), TRUE);
        }
 
+       function remove_incoming() {
+               $user = common_current_user();
+               
+               if (!$user->incomingemail) {
+                       $this->show_form(_('No incoming email address.'));
+                       return;
+               }
+               
+               $orig = clone($user);
+               $user->incomingemail = NULL;
+
+               if (!$user->updateKeys($orig)) {
+                       common_log_db_error($user, 'UPDATE', __FILE__);
+                       $this->server_error(_("Couldn't update user record."));
+               }
+               
+               $this->show_form(_('Incoming email address removed.'), TRUE);
+       }
+
+       function new_incoming() {
+               $user = common_current_user();
+               
+               $orig = clone($user);
+               $user->incomingemail = mail_new_incoming_address();
+               
+               if (!$user->updateKeys($orig)) {
+                       common_log_db_error($user, 'UPDATE', __FILE__);
+                       $this->server_error(_("Couldn't update user record."));
+               }
+
+               $this->show_form(_('New incoming email address added.'), TRUE);
+       }
+       
        function email_exists($email) {
                $user = common_current_user();
                $other = User::staticGet('email', $email);