X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=c93cbfae0d74e423cd54ba4c1441f3d177abe06a;hb=f7865b1d410e303bb5dc2549d12823f37149b8e5;hp=d8a7bb6c3372e473e4362dbfd394cf50fd05a355;hpb=594811350c67feede35d50f05a9e1311b8c4c036;p=quix0rs-gnu-social.git

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index d8a7bb6c33..c93cbfae0d 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -34,6 +34,7 @@ class EmailsettingsAction extends SettingsAction {
 										   'id' => 'emailsettings',
 										   'action' =>
 										   common_local_url('emailsettings')));
+		common_hidden('token', common_session_token());
 
 		common_element('h2', NULL, _('Address'));
 
@@ -83,14 +84,17 @@ class EmailsettingsAction extends SettingsAction {
 		}
 		
 		common_element('h2', NULL, _('Preferences'));
-		
+
 		common_checkbox('emailnotifysub',
-						_('Send me notices of new subscriptions through email.'),
-						$user->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');
@@ -111,6 +115,13 @@ class EmailsettingsAction 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')) {
@@ -131,6 +142,8 @@ class EmailsettingsAction extends SettingsAction {
 	function save_preferences() {
 
 		$emailnotifysub = $this->boolean('emailnotifysub');
+		$emailmicroid = $this->boolean('emailmicroid');
+		$emailpost = $this->boolean('emailpost');
 
 		$user = common_current_user();
 
@@ -141,6 +154,8 @@ class EmailsettingsAction extends SettingsAction {
 		$original = clone($user);
 
 		$user->emailnotifysub = $emailnotifysub;
+		$user->emailmicroid = $emailmicroid;
+		$user->emailpost = $emailpost;
 
 		$result = $user->update($original);
 
@@ -267,8 +282,8 @@ class EmailsettingsAction extends SettingsAction {
 		
 		$orig = clone($user);
 		$user->incomingemail = NULL;
-		
-		if (!$user->update($orig)) {
+
+		if (!$user->updateKeys($orig)) {
 			common_log_db_error($user, 'UPDATE', __FILE__);
 			$this->server_error(_("Couldn't update user record."));
 		}
@@ -282,7 +297,7 @@ class EmailsettingsAction extends SettingsAction {
 		$orig = clone($user);
 		$user->incomingemail = mail_new_incoming_address();
 		
-		if (!$user->update($orig)) {
+		if (!$user->updateKeys($orig)) {
 			common_log_db_error($user, 'UPDATE', __FILE__);
 			$this->server_error(_("Couldn't update user record."));
 		}