X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=6e189a909d4a4c585cce158fa74a796a007a0b1f;hb=0625f18c8e29bd840546136abe9e869b145fc497;hp=5e2c06bbd3c90c8b3270e76ce57038d1b171fb91;hpb=a4fa34cecbd038fb2cc323aefd2b32739aaee7d5;p=quix0rs-gnu-social.git

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 5e2c06bbd3..6e189a909d 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'));
 
@@ -87,6 +88,12 @@ 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('emailpost',
 						_('I want to post notices by email.'),
 						$user->emailpost);
@@ -114,6 +121,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')) {
@@ -134,6 +148,8 @@ class EmailsettingsAction 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');
 
@@ -146,6 +162,8 @@ class EmailsettingsAction extends SettingsAction {
 		$original = clone($user);
 
 		$user->emailnotifysub = $emailnotifysub;
+		$user->emailnotifyfav = $emailnotifyfav;
+		$user->emailnotifymsg = $emailnotifymsg;
 		$user->emailmicroid = $emailmicroid;
 		$user->emailpost = $emailpost;