Navigation

Changeset 1171

Timestamp:

06/21/08 18:45:57 (7 months ago)

Author:

piyawat

Message:

add cc: and bcc: to user email form

Files:

r956	r1171
71	71
72	72	def create_mail_from_params
73		@mail = params[:mail].is_a?(Hash) ? ContactMail.new(params[:mail][:name], params[:mail][:address], params[:mail][:subject], params[:mail][:message]) : nil
	73	if params[:mail].is_a?(Hash)
	74	@email = ContactMail.new(
	75	params[:mail][:name],
	76	params[:mail][:address],
	77	params[:mail][:cc],
	78	params[:mail][:bcc],
	79	params[:mail][:subject],
	80	params[:mail][:message]
	81	)
	82	else
	83	@email = nil
	84	end
74	85	unless @mail.nil? \|\| @mail.valid?
75	86	flash_notice _("All fields are required.")
…	…
83	94	attr_accessor :name, :address, :subject, :message
84	95
85		def initialize(name, address, subject, message)
86		@name = name; @address = address; @subject = subject; @message = message
	96	def initialize(name, address, cc, bcc, subject, message)
	97	@name = name; @address = address; @cc = cc; @bcc = bcc; @subject = subject; @message = message
87	98	end
88	99

r1117	r1171
17	17	def contact(user, mail, request, locale, webmaster=false, recipients='')
18	18	@recipients = recipients.blank? ? user.email : recipients
	19	@cc = mail.cc if mail.cc
	20	@bcc = mail.bcc if mail.bcc
19	21	@from = 'support@' + request.host
20	22	@headers = {"Reply-To" => mail.address}

r1131	r1171
22	22	<td><%= _("Your Email") + ":" %></td>
23	23	<td><%= text_field "mail", "address", :class => "common" %></td>
	24	</tr>
	25	<tr>
	26	<td><%= _("CC") + ":" %></td>
	27	<td><%= text_field "mail", "cc", :class => "common" %></td>
	28	</tr>
	29	<tr>
	30	<td> </td>
	31	<td><%= _("Optional. Also send this mail to the following addresses.") %></td>
	32	</tr>
	33	<tr>
	34	<td><%= _("BCC") + ":" %></td>
	35	<td><%= text_field "mail", "bcc", :class => "common" %></td>
	36	</tr>
	37	<tr>
	38	<td> </td>
	39	<td><%= _("Optional. Also send this mail to the following addresses but not reveal the addresses.") %></td>
24	40	</tr>
25	41	<tr>