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

Adds min/max email length in UI and backend

Browse Source
This commit is contained in:
Vlad
2017-09-19 19:36:39 -04:00
parent 28c75c5b96
commit 697f9ba5bc
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Form/Block/Base.php
View File

@ -1,7 +1,9 @@
<?php
namespace MailPoet\Form\Block;
use MailPoet\Form\Util\FieldNameObfuscator;
use MailPoet\Models\ModelValidator;
abstract class Base {
protected static function getInputValidation($block, $extra_rules = array()) {
@ -9,6 +11,8 @@ abstract class Base {
if($block['id'] === 'email') {
$rules['required'] = true;
$rules['minlength'] = ModelValidator::EMAIL_MIN_LENGTH;
$rules['maxlength'] = ModelValidator::EMAIL_MAX_LENGTH;
$rules['error-message'] = __('Please specify a valid email address.', 'mailpoet');
}

7
lib/Models/ModelValidator.php
View File

@ -7,6 +7,9 @@ if(!defined('ABSPATH')) exit;
class ModelValidator extends \Sudzy\Engine {
public $validators;
const EMAIL_MIN_LENGTH = 6;
const EMAIL_MAX_LENGTH = 150;
function __construct() {
parent::__construct();
$this->validators = array(
@ -26,7 +29,9 @@ class ModelValidator extends \Sudzy\Engine {
}
function validateEmail($email) {
return is_email($email) !== false;
$permitted_length = (strlen($email) >= self::EMAIL_MIN_LENGTH && strlen($email) <= self::EMAIL_MAX_LENGTH);
$valid_email = (is_email($email) !== false);
return ($permitted_length && $valid_email);
}
function validateRenderedNewsletterBody($newsletter_body) {

3
tests/unit/Models/ModelValidatorTest.php
View File

@ -21,8 +21,9 @@ class ModelValidatorTest extends \MailPoetTest {
function testItValidatesEmail() {
expect($this->validator->validateEmail('test'))->false();
expect($this->validator->validateEmail('tést@éxample.com'))->false();
expect($this->validator->validateEmail('test@example.com'))->true();
expect($this->validator->validateEmail('loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_email@example.com'))->false();
expect($this->validator->validateEmail('a@b.c'))->false();
}
function testItValidatesRenderedNewsletterBody() {