summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/email_address.rb4
-rw-r--r--app/models/setting.rb2
2 files changed, 2 insertions, 4 deletions
diff --git a/app/models/email_address.rb b/app/models/email_address.rb
index 5a0f32abe..cc9064e04 100644
--- a/app/models/email_address.rb
+++ b/app/models/email_address.rb
@@ -20,8 +20,6 @@
class EmailAddress < ActiveRecord::Base
include Redmine::SafeAttributes
- EMAIL_REGEXP = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+(?:(?:xn--[-a-z0-9]+)|(?:[a-z]{2,})))\z/i
-
belongs_to :user
after_update :destroy_tokens
@@ -32,7 +30,7 @@ class EmailAddress < ActiveRecord::Base
after_destroy_commit :deliver_security_notification_destroy
validates_presence_of :address
- validates_format_of :address, :with => EMAIL_REGEXP, :allow_blank => true
+ validates_format_of :address, :with => URI::MailTo::EMAIL_REGEXP, :allow_blank => true
validates_length_of :address, :maximum => User::MAIL_LENGTH_LIMIT, :allow_nil => true
validates_uniqueness_of :address, :case_sensitive => false,
:if => Proc.new {|email| email.address_changed? && email.address.present?}
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 81f121db4..a44f92ce3 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -187,7 +187,7 @@ class Setting < ActiveRecord::Base
if settings.key?(:mail_from)
begin
mail_from = Mail::Address.new(settings[:mail_from])
- raise unless EmailAddress::EMAIL_REGEXP.match?(mail_from.address)
+ raise unless URI::MailTo::EMAIL_REGEXP.match?(mail_from.address)
rescue
messages << [:mail_from, l('activerecord.errors.messages.invalid')]
end