Do not remove line breaks from mails sent with the form generator (#1959

)
contao · May 28, 2010 · 173ca70 · 173ca70
1 parent ff5362c
commit 173ca70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/contao-2.9/CHANGELOG.txt b/contao-2.9/CHANGELOG.txt
@@ -46,6 +46,7 @@ Version 2.9.RC1 (2010--)
 - Fixed: corrected a few spelling mistakes and translation issues (#2032)
 - Fixed: subpalettes were not inserted correctly when loaded via Ajax (#2039)
 - Fixed: the DC_File driver did not support multi-text fields (#2045)
+- Fixed: do not remove line breaks from mails sent with the form generator (#1959)
 - Fixed a few minor issues
 
 Version 2.9.beta1 (2010-05-17)

diff --git a/contao-2.9/system/modules/frontend/Form.php b/contao-2.9/system/modules/frontend/Form.php
@@ -278,23 +278,23 @@ protected function processFormData($arrSubmitted)
 				}
 
 				// Add field to message
-				$message .= ucfirst($k) . ': ' . (is_array($v) ? implode(', ', $v) : preg_replace('/[\n\t\r]+/', ' ', $v)) . "\n";
+				$message .= ucfirst($k) . ': ' . (is_array($v) ? implode(', ', $v) : $v) . "\n";
 
 				// Prepare XML file
 				if ($this->format == 'xml')
 				{
 					$fields[] = array
 					(
 						'name' => $k,
-						'values' => (is_array($v) ? $v : array(preg_replace('/[\n\t\r]+/', ' ', $v)))
+						'values' => (is_array($v) ? $v : array($v))
 					);
 				}
 
 				// Prepare CSV file
 				if ($this->format == 'csv')
 				{
 					$keys[] = $k;
-					$values[] = (is_array($v) ? implode(',', $v) : preg_replace('/[\n\t\r]+/', ' ', $v));
+					$values[] = (is_array($v) ? implode(',', $v) : $v);
 				}
 			}
 
@@ -360,7 +360,7 @@ protected function processFormData($arrSubmitted)
 			// Attach CSV file
 			if ($this->format == 'csv')
 			{
-				$email->attachFileFromString($this->String->decodeEntities(implode(';', $keys) . "\n" . implode(';', $values)), 'form.csv', 'text/comma-separated-values');
+				$email->attachFileFromString($this->String->decodeEntities('"' . implode(';', $keys) . '"' . "\n" . '"' . implode('";"', $values) . '"'), 'form.csv', 'text/comma-separated-values');
 			}
 
 			$uploaded = '';