X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=5e2c06bbd3c90c8b3270e76ce57038d1b171fb91;hb=2e239e3fbb4b8b8bc837f32ee750c9cbf266f246;hp=a8b1fc5b74de6797cc31219bcb5f2318de3c223f;hpb=993e2a82fe922c8f11a0117c32c835709e6888a6;p=quix0rs-gnu-social.git

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index a8b1fc5b74..5e2c06bbd3 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -63,14 +63,39 @@ class EmailsettingsAction 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('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();
 	}
@@ -97,6 +122,10 @@ class EmailsettingsAction 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 +134,8 @@ class EmailsettingsAction extends SettingsAction {
 	function save_preferences() {
 
 		$emailnotifysub = $this->boolean('emailnotifysub');
+		$emailmicroid = $this->boolean('emailmicroid');
+		$emailpost = $this->boolean('emailpost');
 
 		$user = common_current_user();
 
@@ -115,6 +146,8 @@ class EmailsettingsAction extends SettingsAction {
 		$original = clone($user);
 
 		$user->emailnotifysub = $emailnotifysub;
+		$user->emailmicroid = $emailmicroid;
+		$user->emailpost = $emailpost;
 
 		$result = $user->update($original);
 
@@ -173,6 +206,10 @@ class EmailsettingsAction 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 +261,42 @@ class EmailsettingsAction 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);