X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c3300d8c93d82af7d5f685215c77bdd84dca5fc4..c9f9ade96fef0e058704bd8583eb44dddff9965e:/app/helpers/browse_tags_helper.rb diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb index bbf6f3cf7..fc25325a4 100644 --- a/app/helpers/browse_tags_helper.rb +++ b/app/helpers/browse_tags_helper.rb @@ -21,6 +21,8 @@ module BrowseTagsHelper link_to h(wmc[:title]), wmc[:url], :title => t("browse.tag_details.wikimedia_commons_link", :page => wmc[:title]) elsif url = wiki_link("tag", "#{key}=#{value}") link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value) + elsif email = email_link(key, value) + link_to(h(email[:email]), email[:url], :title => t("browse.tag_details.email_link", :email => email[:email])) elsif phones = telephone_links(key, value) # similarly, telephone_links() returns an array of phone numbers phones = phones.map do |p| @@ -123,6 +125,25 @@ module BrowseTagsHelper nil end + def email_link(_key, value) + # Does the value look like an email? eg "someone@domain.tld" + + # Uses Ruby built-in regexp to validate email. + # This will not catch certain valid emails containing comments, whitespace characters, + # and quoted strings. + # (see: https://github.com/ruby/ruby/blob/master/lib/uri/mailto.rb) + + # remove any leading and trailing whitespace + email = value.strip + + if email.match?(URI::MailTo::EMAIL_REGEXP) + # add 'mailto:'' prefix + return { :email => email, :url => "mailto:#{email}" } + end + + nil + end + def telephone_links(_key, value) # Does it look like a global phone number? eg "+1 (234) 567-8901 " # or a list of alternate numbers separated by ; @@ -134,7 +155,7 @@ module BrowseTagsHelper # # Also accepting / as a visual separator although not given in RFC 3966, # because it is used as a visual separator in OSM data in some countries. - if value.match?(%r{^\s*\+[\d\s\(\)/\.-]{6,25}\s*(;\s*\+[\d\s\(\)/\.-]{6,25}\s*)*$}) + if value.match?(%r{^\s*\+[\d\s()/.-]{6,25}\s*(;\s*\+[\d\s()/.-]{6,25}\s*)*$}) return value.split(";").map do |phone_number| # for display, remove leading and trailing whitespace phone_number = phone_number.strip