diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php index 195a013f..f9f94216 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php @@ -19,7 +19,7 @@ class Zendesk_Zendesk_Model_Api_Requesters extends Zendesk_Zendesk_Model_Api_Use { public function create($email, $name = null) { - if(!Zend_Validate::is($email, 'EmailAddress')) { + if(!Zend_Validate::is($email, 'EmailAddress', array('domain' => false))) { throw new InvalidArgumentException('Invalid email address provided'); } diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php index 63ef4f8f..780ee786 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php @@ -19,7 +19,7 @@ class Zendesk_Zendesk_Model_Api_Users extends Zendesk_Zendesk_Model_Api_Abstract { public function find($email) { - if(!Zend_Validate::is($email, 'EmailAddress')) { + if(!Zend_Validate::is($email, 'EmailAddress', array('domain' => false))) { throw new InvalidArgumentException('Invalid email address provided'); } diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php index 30559d9c..f044d07a 100644 --- a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php +++ b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php @@ -80,7 +80,7 @@ public function saveConfig(Varien_Event_Observer $observer) // If the email is already set, then do nothing if($currentEmail !== $zendeskEmail) { // Ensure the email address value exists and is valid - if(Zend_Validate::is($zendeskEmail, 'EmailAddress')) { + if(Zend_Validate::is($zendeskEmail, 'EmailAddress', array('domain' => false))) { Mage::getModel('core/config')->saveConfig('zendesk/hidden/contact_email_old', $currentEmail, $scope, $scopeId); Mage::getModel('core/config')->saveConfig('contacts/email/recipient_email', $zendeskEmail, $scope, $scopeId); } diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php index 0b32493e..4b2768cc 100644 --- a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php +++ b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php @@ -359,7 +359,7 @@ public function finaliseAction() // If the email is already set, then do nothing if($currentEmail !== $zendeskEmail) { // Ensure the email address value exists and is valid - if(Zend_Validate::is($zendeskEmail, 'EmailAddress')) { + if(Zend_Validate::is($zendeskEmail, 'EmailAddress', array('domain' => false))) { Mage::getModel('core/config')->saveConfig('zendesk/hidden/contact_email_old', $currentEmail); Mage::getModel('core/config')->saveConfig('contacts/email/recipient_email', $zendeskEmail); }