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]))
+ mail_to(email, :title => t("browse.tag_details.email_link", :email => email))
elsif phones = telephone_links(key, value)
# similarly, telephone_links() returns an array of phone numbers
phones = phones.map do |p|
elsif colour_value = colour_preview(key, value)
tag.span("", :class => "colour-preview-box", :"data-colour" => colour_value, :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value
else
- linkify h(value)
+ safe_join(value.split(";").map { |x| linkify(h(x)) }, ";")
end
end
# the correct page.
lookup_us = lookup.tr(" ", "_")
- if page = WIKI_PAGES.dig(locale, type, lookup_us)
- url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
- elsif page = WIKI_PAGES.dig("en", type, lookup_us)
- url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
- end
+ page = WIKI_PAGES.dig(locale, type, lookup_us) ||
+ WIKI_PAGES.dig("en", type, lookup_us)
+
+ url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" if page
url
end
# Must break it up to correctly build the url
value = Regexp.last_match(1)
section = "##{Regexp.last_match(2)}"
- encoded_section = "##{CGI.escape(Regexp.last_match(2).gsub(/ +/, '_')).tr('%', '.')}"
+ encoded_section = "##{CGI.escape(Regexp.last_match(2).gsub(/ +/, '_'))}"
else
section = ""
encoded_section = ""
nil
end
- def email_link(_key, value)
+ def email_link(key, value)
+ # Avoid converting conditional tags into emails, since EMAIL_REGEXP is quite permissive
+ return nil unless %w[email contact:email].include? key
+
# Does the value look like an email? eg "someone@domain.tld"
# Uses Ruby built-in regexp to validate email.
# 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
+ return email if email.match?(URI::MailTo::EMAIL_REGEXP)
nil
end