Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove confirmation sender settings and warnings

Browse Source 
[MAILPOET-2328]
This commit is contained in:
Amine Ben hammou
2019-09-09 18:48:34 +01:00
committed by Jack Kitterhing
parent 674d8f9926
commit 77322a08ce
2 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Services/AuthorizedEmailsController.php
View File

@@ -53,8 +53,7 @@ class AuthorizedEmailsController {
function onSettingsSave($settings) {
$sender_address_set = !empty($settings['sender']['address']);
$confirmation_address_set = !empty($settings['signup_confirmation']['from']['address']);
if ($sender_address_set || $confirmation_address_set) {
if ($sender_address_set) {
$this->checkAuthorizedEmailAddresses();
}
}
@@ -73,14 +72,10 @@ class AuthorizedEmailsController {
private function validateAddressesInSettings($authorized_emails, $result = []) {
$default_sender_address = $this->settings->get('sender.address');
$signup_confirmation_address = $this->settings->get('signup_confirmation.from.address');
if (!$this->validateAuthorizedEmail($authorized_emails, $default_sender_address)) {
$result['invalid_sender_address'] = $default_sender_address;
}
if (!$this->validateAuthorizedEmail($authorized_emails, $signup_confirmation_address)) {
$result['invalid_confirmation_address'] = $signup_confirmation_address;
}
return $result;
}