Skip to content

Commit a8ab61e

Browse files
author
Till Brehm
committed
Added allowempty setting to ISEMAIL validator.
1 parent 61a4348 commit a8ab61e

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

interface/lib/classes/tform_base.inc.php

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -974,16 +974,21 @@ function validateField($field_name, $field_value, $validators) {
974974
}
975975
}
976976
case 'ISEMAIL':
977-
if(function_exists('filter_var')) {
978-
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
979-
$errmsg = $validator['errmsg'];
980-
if(isset($this->wordbook[$errmsg])) {
981-
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
982-
} else {
983-
$this->errorMessage .= $errmsg."<br />\r\n";
977+
if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
978+
if($validator['allowempty'] == 'y' && $field_value == '') {
979+
//* Do nothing
980+
} else {
981+
if(function_exists('filter_var')) {
982+
if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
983+
$errmsg = $validator['errmsg'];
984+
if(isset($this->wordbook[$errmsg])) {
985+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
986+
} else {
987+
$this->errorMessage .= $errmsg."<br />\r\n";
988+
}
984989
}
985-
}
986-
} else $this->errorMessage .= "function filter_var missing <br />\r\n";
990+
} else $this->errorMessage .= "function filter_var missing <br />\r\n";
991+
}
987992
break;
988993
case 'ISINT':
989994
if(function_exists('filter_var') && $field_value < 2147483647) {

0 commit comments

Comments
 (0)