From f7c61b629e76e21ae78c6da3e9f6ee070d03bae8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 2 Apr 2005 08:16:57 +0000 Subject: Added options to set cc, bcc, subject, and body for UrlHelper#mail_to #966 [DeLynn] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1056 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_view/helpers/url_helper.rb | 25 ++++++++++++++++++++---- actionpack/test/template/url_helper_test.rb | 8 +++++++- 3 files changed, 30 insertions(+), 5 deletions(-) (limited to 'actionpack') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8ae43e9ffe..c3dc91fd38 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added options to set cc, bcc, subject, and body for UrlHelper#mail_to #966 [DeLynn] + * Fixed include_blank for select_hour/minute/second #527 [edward@debian.org] * Improved the message display on the exception handler pages #963 [Johan Sorensen] diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 4aaab2d3a5..616f1475ec 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -99,18 +99,35 @@ module ActionView # link unless +name+ is specified. Additional HTML options, such as class or id, can be passed in the html_options hash. # # You can also make it difficult for spiders to harvest email address by obfuscating them. - # Examples: + # Examples: # mail_to "me@domain.com", "My email", :encode => "javascript" # => # # # mail_to "me@domain.com", "My email", :encode => "hex" # => # My email + # + # You can also specify the cc address, bcc address, subject, and body parts of the message header to create a complex e-mail using the + # corresponding +cc+, +bcc+, +subject+, and +body+ html_options keys. Each of these options are URI escaped and then appended to + # the email_address before being output. Be aware that javascript keywords will not be escaped and may break this feature + # when encoding with javascript. + # Examples: + # mail_to "me@domain.com", "My email", :cc => "ccaddress@domain.com", :bcc => "bccaddress@domain.com", :subject => "This is an example email", :body => "This is the body of the message." # => + # My email def mail_to(email_address, name = nil, html_options = {}) html_options = html_options.stringify_keys encode = html_options.delete("encode") + cc, bcc, subject, body = html_options.delete("cc"), html_options.delete("bcc"), html_options.delete("subject"), html_options.delete("body") + string = '' + extras = '' + extras << "cc=#{CGI.escape(cc).gsub("+", "%20")}&" unless cc.nil? + extras << "bcc=#{CGI.escape(bcc).gsub("+", "%20")}&" unless bcc.nil? + extras << "body=#{CGI.escape(body).gsub("+", "%20")}&" unless body.nil? + extras << "subject=#{CGI.escape(subject).gsub("+", "%20")}&" unless subject.nil? + extras = "?" << extras.gsub!(/&?$/,"") unless extras.empty? + if encode == 'javascript' - tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s }))}');" + tmp = "document.write('#{content_tag("a", name || email_address, html_options.merge({ "href" => "mailto:"+email_address.to_s+extras }))}');" for i in 0...tmp.length string << sprintf("%%%x",tmp[i]) end @@ -123,9 +140,9 @@ module ActionView string << email_address[i,1] end end - content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{string}" }) + content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{string}#{extras}" }) else - content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}" }) + content_tag "a", name || email_address, html_options.merge({ "href" => "mailto:#{email_address}#{extras}" }) end end diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 32b98eb5dc..b1f2dd65e9 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -79,10 +79,16 @@ class UrlHelperTest < Test::Unit::TestCase mail_to("david@loudthinking.com", "David Heinemeier Hansson", :class => "admin") end - def test_mail_to_with_javascript assert_equal "", mail_to("me@domain.com", "My email", :encode => "javascript") end + + def test_mail_with_options + assert_equal( + %(My email), + mail_to("me@example.com", "My email", :cc => "ccaddress@example.com", :bcc => "bccaddress@example.com", :subject => "This is an example email", :body => "This is the body of the message.") + ) + end def test_mail_to_with_hex assert_equal "My email", mail_to("me@domain.com", "My email", :encode => "hex") -- cgit v1.2.3