Skip to content

disabled domain validation to allow mail addresses from new TLDs #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

disabled domain validation to allow mail addresses from new TLDs #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/code/community/Zendesk/Zendesk/Model/Api/Requesters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/code/community/Zendesk/Zendesk/Model/Observer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down