From 73bf168b8c3431da794ca4423124fdc2121d1772 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Tue, 12 May 2009 06:10:13 +0000
Subject: [PATCH] FEATURE: ability to send emails as plain text. BUGFIX: fixed
 showing header fields in reports

---
 code/UserDefinedForm.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/code/UserDefinedForm.php b/code/UserDefinedForm.php
index 3589f40..d6ef5f7 100755
--- a/code/UserDefinedForm.php
+++ b/code/UserDefinedForm.php
@@ -396,6 +396,9 @@ JS
 		$submittedFields = new DataObjectSet();
 		
 		foreach($this->Fields() as $field) {
+			// don't show fields that shouldn't be shown
+			if(!$field->showInReports()) continue;
+			
 			$submittedField = new SubmittedFormField();
 			$submittedField->ParentID = $submittedForm->ID;
 			$submittedField->Name = $field->Name;
@@ -484,7 +487,19 @@ JS
 						$email->setTo($submittedFormField->Value);	
 					}
 				}
-				$email->send();
+				if($recipient->SendPlain) {
+					$body = strip_tags($recipient->EmailBody) . "\n ";
+					if(isset($emailData['Fields'])) {
+						foreach($emailData['Fields'] as $Field) {
+							$body .= $Field->Title .' - '. $Field->Value .'\n';
+						}
+					}
+					$email->setBody($body);
+					$email->sendPlain();
+				}
+				else {
+					$email->send();	
+				}
 			}
 		}
 		
@@ -526,7 +541,8 @@ class UserDefinedForm_EmailRecipient extends DataObject {
 		'EmailAddress' => 'Varchar(200)',
 		'EmailSubject' => 'Varchar(200)',
 		'EmailFrom' => 'Varchar(200)',
-		'EmailBody' => 'HTMLText'
+		'EmailBody' => 'HTMLText',
+		'SendPlain' => 'Boolean'
 	);
 	
 	static $has_one = array(
@@ -546,6 +562,7 @@ class UserDefinedForm_EmailRecipient extends DataObject {
 			new TextField('EmailSubject', _t('UserDefinedForm.EMAILSUBJECT', 'Email Subject')),
 			new TextField('EmailFrom', _t('UserDefinedForm.FROMADDRESS','From Address')),
 			new TextField('EmailAddress', _t('UserDefinedForm.SENDEMAILTO','Send Email To')),
+			new CheckboxField('SendPlain', _t('UserDefinedForm.SENDPLAIN', 'Send Email as Plain Text (HTML will be stripped)')),
 			new DropdownField('FormID', 'Form', $forms)
 		);