FIX: duplicate replyTo addresses appended

code/model/UserDefinedForm.php

@@ -825,7 +825,6 @@ JS
 		// email users on submit.
 		if($this->FilteredEmailRecipients()) {
 			$email = new UserDefinedForm_SubmittedFormEmail($submittedFields); 
-			$email->populateTemplate($emailData);
 			
 			if($attachments){
 				foreach($attachments as $file) {
@@ -848,7 +847,7 @@ JS
 				$email->setTo($recipient->EmailAddress);
 				
 				if($recipient->EmailReplyTo) {
-					$email->replyTo($recipient->EmailReplyTo);
+					$email->setReplyTo($recipient->EmailReplyTo);
 				}
 
 				// check to see if they are a dynamic reply to. eg based on a email field a user selected
@@ -856,7 +855,7 @@ JS
 					$submittedFormField = $submittedFields->find('Name', $recipient->SendEmailFromField()->Name);
 
 					if($submittedFormField && is_string($submittedFormField->Value)) {
-						$email->replyTo($submittedFormField->Value);
+						$email->setReplyTo($submittedFormField->Value);
 					}
 				}
 				// check to see if they are a dynamic reciever eg based on a dropdown field a user selected
@@ -1056,4 +1055,14 @@ class UserDefinedForm_SubmittedFormEmail extends Email {
 	public function __construct($submittedFields = null) {
 		parent::__construct($submittedFields = null);
 	}
+	
+	/**	
+	 * Set the "Reply-To" header with an email address rather than append as
+	 * {@link Email::replyTo} does. 
+	 *
+	 * @param string $email The email address to set the "Reply-To" header to
+ 	 */
+	public function setReplyTo($email) {
+		$this->customHeaders['Reply-To'] = $email;
+	}  
 }

lang/ar_SA.yml

@@ -163,8 +163,8 @@ ar_SA:
         ONCOMPLETE: "تم اكتمال الطلب"
         ONCOMPLETELABEL: "عرض الطلبات المكتملة"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "الملفات المستقبلة"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/bg_BG.yml

@@ -163,8 +163,8 @@ bg_BG:
         ONCOMPLETE: "При завършване"
         ONCOMPLETELABEL: "Покажи при завършване"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Получени Заявления"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/da_DK.yml

@@ -160,8 +160,8 @@ da_DK:
         ONCOMPLETE: "Ved gennemført"
         ONCOMPLETELABEL: "Vis ved gennemført"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Indsendelse modtaget"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/de_DE.yml

@@ -163,8 +163,8 @@ de_DE:
         ONCOMPLETE: "Nach Fertigstellung"
         ONCOMPLETELABEL: "Nach Vervollständigung anzeigen"
         OPTIONS: "Optionen"
-        ORSELECTAFIELDTOUSEASFROM: ".. oder wähle ein Form Field als Gesendet-Von Adresse"
+        ORSELECTAFIELDTOUSEASFROM: ".. oder wähle ein form field als Gesendet-Von Adresse"
-        ORSELECTAFIELDTOUSEASTO: ".. oder wähle ein Form Feld als Sende-An Adresse"
+        ORSELECTAFIELDTOUSEASTO: ".. oder wähle ein form field als Sende-An Adresse"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Erhaltene Einreichungen"
         SAVESUBMISSIONS: "Speichern von Einreichungen ausschalten"

lang/en_GB.yml

@@ -163,8 +163,8 @@ en_GB:
         ONCOMPLETE: "On complete"
         ONCOMPLETELABEL: "Show on completion"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Received Submissions"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/en_US.yml

@@ -123,30 +123,30 @@ en_US:
         NOSUBMISSIONS: "No Submissions"
         SUBMITTED: "Submitted at"
     UserDefinedForm:
-        AEMAILRECIPIENT: "A Email Recipient"
+        DESCRIPTION: 'Generic content page'
-        EMAILADDRESS: "Email"
+        EMAILADDRESS: Email
-        EMAILBODY: "Body"
+        EMAILBODY: Body
-        EMAILFROM: "From"
+        EMAILFROM: From
-        EMAILRECIPIENTS: "Email Recipients"
+        EMAILSUBJECT: 'Email subject'
-        EMAILSUBJECT: "Email Subject"
+        EmailFromContent: 'The from address allows you to set who the email comes from. On most servers this will need to be set to an email address on the same domain name as your site. For example on yoursite.com the from address may need to be something@yoursite.com. You can however, set any email address you wish as the reply to address.'
-        FORM: "Form"
+        FORM: Form
-        FROMADDRESS: "Send Email From"
+        FORMOPTIONS: 'Form Options'
-        HIDEFORMDATA: "Hide Form Data from Email"
+        FORMSUBMISSIONS: 'Form Submissions'
-        ONCOMPLETE: "On Complete"
+        FROMADDRESS: 'Send email from'
-        ONCOMPLETELABEL: "Show on completion"
+        HIDEFORMDATA: 'Hide form data from email?'
-        OPTIONS: "Options"
+        ONCOMPLETELABEL: 'Show on completion'
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: '.. or select a field to use as reply to address'
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: '.. or select a field to use as the to address'
-        PLURALNAME: "User Defined Forms"
+        PLURALNAME: 'User Defined Forms'
-        RECEIVED: "Received Submissions"
+        RECEIVED: 'Received Submissions'
-        SAVESUBMISSIONS: "Disable Saving Submissions to Server"
+        REPLYADDRESS: 'Email for reply to'
-        SENDEMAILTO: "Send Email To"
+        SAVESUBMISSIONS: 'Disable Saving Submissions to Server'
-        SENDPLAIN: "Send Email as Plain Text (HTML will be stripped)"
+        SENDEMAILTO: 'Send email to'
-        SHOWCLEARFORM: "Show Clear Form Button"
+        SENDPLAIN: 'Send email as plain text? (HTML will be stripped)'
-        SINGULARNAME: "User Defined Form"
+        SHOWCLEARFORM: 'Show Clear Form Button'
-        SUBMISSIONS: "Submissions"
+        SINGULARNAME: 'User Defined Form'
-        SUBMITBUTTON: "Submit"
+        SUBMITBUTTON: Submit
-        TEXTONSUBMIT: "Text on submit button:"
+        TEXTONSUBMIT: 'Text on submit button:'
     UserDefinedForm_EmailRecipient:
         PLURALNAME: "User Defined Form Email Recipients"
         SINGULARNAME: "User Defined Form Email Recipient"

lang/es_MX.yml

@@ -163,8 +163,8 @@ es_MX:
         ONCOMPLETE: "Al completar"
         ONCOMPLETELABEL: "Mostrar cuando se complete"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Peticiones Recibidas"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/et_EE.yml

@@ -163,8 +163,8 @@ et_EE:
         ONCOMPLETE: "Lõpetamisel"
         ONCOMPLETELABEL: "Näita lõpetamisel"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Vastuvõetud kaastööd"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/fi_FI.yml

@@ -141,8 +141,8 @@ fi_FI:
         ONCOMPLETE: "Valmistuessa"
         ONCOMPLETELABEL: "Näytä valmistuessa"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Vastaanotetut lähetykset"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/fr_FR.yml

@@ -163,8 +163,8 @@ fr_FR:
         ONCOMPLETE: "Complétion en cours"
         ONCOMPLETELABEL: "Utiliser la complétion"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Soumissions reçues"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/hr_HR.yml

@@ -154,8 +154,8 @@ hr_HR:
         ONCOMPLETE: "On Complete"
         ONCOMPLETELABEL: "Show on completion"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Received Submissions"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/ms_MY.yml

@@ -154,8 +154,8 @@ ms_MY:
         ONCOMPLETE: "Setelah lengkap"
         ONCOMPLETELABEL: "Paparkan setelah lengkap"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Kiriman yang diterima"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/nl_NL.yml

@@ -163,8 +163,8 @@ nl_NL:
         ONCOMPLETE: "Als ingevuld"
         ONCOMPLETELABEL: "Toon na invullen"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Ontvangen Verzendingen"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/pl_PL.yml

@@ -163,8 +163,8 @@ pl_PL:
         ONCOMPLETE: "Po uzupełnieniu"
         ONCOMPLETELABEL: "Pokaż po zakończeniu"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Otrzymane Zgłoszenia"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/pt_PT.yml

@@ -157,8 +157,8 @@ pt_PT:
         ONCOMPLETE: "On Complete"
         ONCOMPLETELABEL: "Show on completion"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Dados Recolhidos"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/ru_RU.yml

@@ -163,8 +163,8 @@ ru_RU:
         ONCOMPLETE: "После отправки"
         ONCOMPLETELABEL: "Показать после отправки"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Получено из формы"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/sr_RS.yml

@@ -149,8 +149,8 @@ sr_RS:
         ONCOMPLETE: "On Complete"
         ONCOMPLETELABEL: "Show on completion"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Received Submissions"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"

lang/tr_TR.yml

@@ -163,8 +163,8 @@ tr_TR:
         ONCOMPLETE: "Tamamlanınca"
         ONCOMPLETELABEL: "Tamamlanınca görüntüle"
         OPTIONS: "Options"
-        ORSELECTAFIELDTOUSEASFROM: ".. or Select a Form Field to use as the From Address"
+        ORSELECTAFIELDTOUSEASFROM: ".. or select a field to use as reply to address"
-        ORSELECTAFIELDTOUSEASTO: ".. or Select a Field to use as the To Address"
+        ORSELECTAFIELDTOUSEASTO: ".. or select a field to use as the to address"
         PLURALNAME: "User Defined Forms"
         RECEIVED: "Alınan Gönderiler"
         SAVESUBMISSIONS: "Disable Saving Submissions to Server"