new alternative reply by email addresses

This commit is contained in:
Régis Hanol
2016-06-10 16:14:42 +02:00
parent 9e75b14535
commit dffe50a2e6
7 changed files with 42 additions and 10 deletions

View File

@ -0,0 +1,16 @@
class AlternativeReplyByEmailAddressesValidator
def initialize(opts={})
@opts = opts
end
def valid_value?(val)
return true if val.blank?
validator = ReplyByEmailAddressValidator.new(@opts)
val.split("|").all? { |v| validator.valid_value?(v) }
end
def error_message
I18n.t('site_settings.errors.invalid_alternative_reply_by_email_addresses')
end
end

View File

@ -6,9 +6,9 @@ class ReplyByEmailAddressValidator
def valid_value?(val)
return true if val.blank?
!!(val =~ /@/i) &&
!!(val =~ /%{reply_key}/i) &&
val.gsub(/\+?%{reply_key}/i, "") != SiteSetting.notification_email
!!val["@"] &&
!!val["%{reply_key}"] &&
val.gsub(/\+?%{reply_key}/, "") != SiteSetting.notification_email
end
def error_message