Checking invalid emails on the input [MAILPOET-1288]

This commit is contained in:
Rostislav Wolny
2018-03-06 19:54:23 +01:00
parent 2f05eaf528
commit 46493b991c
11 changed files with 82 additions and 18 deletions

View File

@@ -3,6 +3,7 @@ namespace MailPoet\Subscribers\ImportExport\Import;
use MailPoet\Form\Block\Date;
use MailPoet\Models\CustomField;
use MailPoet\Models\ModelValidator;
use MailPoet\Models\Newsletter;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberCustomField;
@@ -148,12 +149,13 @@ class Import {
function validateSubscribersData($subscribers_data, $validation_rules) {
$invalid_records = array();
$validator = new ModelValidator();
foreach($subscribers_data as $column => &$data) {
$validation_rule = $validation_rules[$column];
if($validation_rule === 'email') {
$data = array_map(
function($index, $email) use(&$invalid_records) {
if(!is_email($email)) {
function($index, $email) use(&$invalid_records, $validator) {
if(!$validator->validateEmail($email)) {
$invalid_records[] = $index;
}
return strtolower($email);