fix crash when sending emails, handle checkboxes field correctly, pro…

…vide html version of email
enigmadigital · Nov 13, 2014 · 8e469c3 · 8e469c3
1 parent e2df2ca
commit 8e469c3
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 6 deletions.
diff --git a/form.html b/form.html
@@ -45,6 +45,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]"
 								value="{{ submission is defined ? submission[question.handle] }}">
@@ -65,6 +66,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								cols="20" rows="2"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]">{{ submission is defined ? submission[question.handle] }}</textarea>
@@ -120,11 +122,14 @@ <h3>Please correct the following errors</h3>
 								{% for option in question.options %}
 									<li>
 										{% set selected = submission is defined and submission[question.handle]
-											? submission[question.handle] == option.value
+											? option.value in submission[question.handle]
 											: option.default %}
+										{% if not selected %}
+											<input type="checkbox" name="questions[{{ question.handle }}][]" value="">
+										{% endif %}
 										<input type="checkbox"
 											id="{{ question.handle ~ loop.index }}"
-											name="questions[{{ question.handle }}]"
+											name="questions[{{ question.handle }}][]"
 											value="{{ option.value }}"
 											{{ selected ? 'checked' }}>
 										<label for="{{ question.handle ~ loop.index }}">{{ option.label }}</label>
@@ -148,6 +153,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]"
 								value="{{ submission is defined ? submission[question.handle] }}">
@@ -168,6 +174,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]"
 								value="{{ submission is defined ? submission[question.handle] }}">
@@ -188,6 +195,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]"
 								value="{{ submission is defined ? submission[question.handle] }}">
@@ -208,6 +216,7 @@ <h3>Please correct the following errors</h3>
 									data-val="true"
 								{% endif %}
 								class="text"
+								placeholder="{{ question.name | upper }}"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}]"
 								value="{{ submission is defined ? submission[question.handle] }}">
@@ -229,7 +238,7 @@ <h3>Please correct the following errors</h3>
 								{% endif %}
 								class="text"
 								pattern="\d{2}\/\d{2}\/\d{4}"
-								placeholder="DD/MM/YYYY"
+								placeholder="{{ question.name | upper }} (DD/MM/YYYY)"
 								id="{{ question.handle }}"
 								name="questions[{{ question.handle }}][date]"
 								value="{{ submission is defined ? submission[question.handle] }}">

diff --git a/formerly/models/Formerly_SubmissionModel.php b/formerly/models/Formerly_SubmissionModel.php
@@ -55,11 +55,37 @@ public function getSummary()
 		$summary = '';
 
 		$questions = $this->getForm()->getQuestions();
+
 		for ($i = 0; $i < count($questions); ++$i)
 		{
 			$question = $questions[$i];
 
-			$summary .= $question->name . "\n: " . $this[$question->handle];
+			$name  = $question->name;
+			$value = $this[$question->handle];
+
+			$summary .= $name . ":\n";
+
+			if ($value instanceof MultiOptionsFieldData)
+			{
+				$options = $value->getOptions();
+
+				for ($j = 0; $j < count($options); ++$j)
+				{
+					$option = $options[$j];
+
+					$summary .= $option->label . ': ' . ($option->selected ? 'yes' : 'no');
+
+					if ($j != count($options) - 1)
+					{
+						$summary .= "\n";
+					}
+				}
+			}
+			else
+			{
+				$summary .= $value;
+			}
+
 			if ($i != count($questions) - 1)
 			{
 				$summary .= "\n\n";

diff --git a/formerly/services/Formerly_SubmissionsService.php b/formerly/services/Formerly_SubmissionsService.php
@@ -10,9 +10,18 @@ public function getSubmissionById($submissionId)
 
 	public function postSubmission(Formerly_SubmissionModel $submission)
 	{
+		$this->onBeforePost(new Event($this, array(
+			'submission' => $submission
+		)));
+
 		if ($this->saveSubmission($submission))
 		{
 			$this->sendSubmissionEmails($submission);
+
+			$this->onPost(new Event($this, array(
+				'submission' => $submission
+			)));
+
 			return true;
 		}
 
@@ -90,11 +99,13 @@ public function sendSubmissionEmails(Formerly_SubmissionModel $submission)
 
 				if (!empty($emailDef['body']))
 				{
-					$email->body = $this->_renderSubmissionTemplate($emailDef['body'], $submission);
+					$email->body     = $this->_renderSubmissionTemplate($emailDef['body'], $submission);
+					$email->htmlBody = nl2br($email->body);
 				}
 				else
 				{
-					$email->body = $submission->getSummary();
+					$email->body     = $submission->getSummary();
+					$email->htmlBody = nl2br($email->body);
 				}
 
 				if (!empty($email->body))
@@ -114,4 +125,14 @@ private function _renderSubmissionTemplate($template, Formerly_SubmissionModel $
 
 		return craft()->templates->renderObjectTemplate($formattedTemplate, $submission);
 	}
+
+	public function onBeforePost(Event $event)
+	{
+		$this->raiseEvent('onBeforePost', $event);
+	}
+
+	public function onPost(Event $event)
+	{
+		$this->raiseEvent('onPost', $event);
+	}
 }