From: Boubacar Date: Mon, 17 Feb 2020 16:39:30 +0000 (-0500) Subject: make email regex slightly more readable X-Git-Tag: live~2197^2~3 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4cf0abb0277dea5350ad09c34233d930e68fb296 make email regex slightly more readable --- diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index 2a1496f13..d4294daaa 100644 --- a/app/helpers/browse_tags_helper.rb +++ b/app/helpers/browse_tags_helper.rb @@ -136,8 +136,10 @@ module BrowseTagsHelper # Uses WHATWG implementation of email validation, which follows RFC 1123 # but is a willful violation of RFC 5322. # (see: https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address) - if value.match?(%r{^\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s* - (;\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s*)*$ + if value.match?(%r{^\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+ + @[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s* + (;\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+ + @[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s*)*$ }x) return value.split(";").map do |email| # remove any leading or trailing whitespace if present