diff --git a/include/class.forms.php b/include/class.forms.php index 0249de4d8cda24f5d7bdd41e72a8496183f6df29..b535d4739576dd17ef36e5236181d4b453b1a4d4 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -718,7 +718,7 @@ class TextboxField extends FormField { $config = $this->getConfiguration(); $validators = array( '' => null, - 'email' => array(array('Validator', 'is_email'), + 'email' => array(array('Validator', 'is_valid_email'), __('Enter a valid email address')), 'phone' => array(array('Validator', 'is_phone'), __('Enter a valid phone number')), diff --git a/include/class.staff.php b/include/class.staff.php index e0525e63dd00da052d54232c652df0d506df5999..94b18b726ad48460f8ea201b0601ba1b964231a8 100644 --- a/include/class.staff.php +++ b/include/class.staff.php @@ -454,7 +454,7 @@ implements EmailContact { if(!$vars['lastname']) $errors['lastname']=__('Last name is required'); - if(!$vars['email'] || !Validator::is_email($vars['email'])) + if(!$vars['email'] || !Validator::is_valid_email($vars['email'])) $errors['email']=__('Valid email is required'); elseif(Email::getIdByEmail($vars['email'])) $errors['email']=__('Already in-use as system email'); diff --git a/include/class.validator.php b/include/class.validator.php index c14f910743f85b72be0ab65b97af64c48354ffb3..fcb350126a22191da7572719617d42a0cfab7be8 100644 --- a/include/class.validator.php +++ b/include/class.validator.php @@ -140,7 +140,7 @@ class Validator { /*** Functions below can be called directly without class instance. Validator::func(var..); (nolint) ***/ - function is_email($email, $list=false) { + function is_email($email, $list=false, $verify=false) { require_once PEAR_DIR . 'Mail/RFC822.php'; require_once PEAR_DIR . 'PEAR.php'; if (!($mails = Mail_RFC822::parseAddressList($email)) || PEAR::isError($mails)) @@ -156,8 +156,16 @@ class Validator { return false; } + if ($verify && !checkdnsrr($m->host, 'MX')) + return false; + return true; } + + function is_valid_email($email) { + return self::is_email($email, false, true); + } + function is_phone($phone) { /* We're not really validating the phone number but just making sure it doesn't contain illegal chars and of acceptable len */ $stripped=preg_replace("(\(|\)|\-|\.|\+|[ ]+)","",$phone); diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index 68443b69e28df95a15b100ec0db60bc55976a30a..138b0af4ccc87f68f69118bd67c091f3b1337bf2 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -42,6 +42,8 @@ if (!$errors['err']) { $lock->getStaffName()); elseif (($emailBanned=TicketFilter::isBanned($ticket->getEmail()))) $errors['err'] = __('Email is in banlist! Must be removed before any reply/response'); + elseif (!Validator::is_valid_email($ticket->getEmail())) + $errors['err'] = __('EndUser email address is not valid! Consider updating it before responding'); } $unbannable=($emailBanned) ? BanList::includes($ticket->getEmail()) : false; diff --git a/scp/emailtest.php b/scp/emailtest.php index c714ef1d0643d6c480aac316b511c851244754ef..1752bf739f84c680ef1666cfffc336eed5029808 100644 --- a/scp/emailtest.php +++ b/scp/emailtest.php @@ -25,8 +25,8 @@ if($_POST){ if(!$_POST['email_id'] || !($email=Email::lookup($_POST['email_id']))) $errors['email_id']=__('Select from email address'); - if(!$_POST['email'] || !Validator::is_email($_POST['email'])) - $errors['email']=__('To email address required'); + if(!$_POST['email'] || !Validator::is_valid_email($_POST['email'])) + $errors['email']=__('Valid recipient email address required'); if(!$_POST['subj']) $errors['subj']=__('Subject required'); diff --git a/setup/install.php b/setup/install.php index 4a348cf632d24b3c7c62a406d80fc1bf86ca898c..1420f2dfab36db7ee48d874b9e127308b45dd32d 100644 --- a/setup/install.php +++ b/setup/install.php @@ -65,7 +65,7 @@ if($_POST && $_POST['s']) { if(!$_POST['email']) $errors['email'] = __('Required'); - elseif(!Validator::is_email($_POST['email'])) + elseif(!Validator::is_valid_email($_POST['email'])) $errors['email'] = __('Invalid'); if(!$_POST['alerts'] && !$_POST['news'])