Adding more tests for SMTP address formatting. Fixes #1100

cakephp · Sep 14, 2010 · 1b48cd6 · 1b48cd6
1 parent 8a43b6d
commit 1b48cd6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -617,9 +617,14 @@ function __encode($subject) {
  * @access private
  */
 	function __formatAddress($string, $smtp = false) {
-		$hasAlias = preg_match('/(.+)\s<(.+)>/', $string, $matches);
-		if ($hasAlias) {
-			return $this->__strip($matches[1] . ' <' . $matches[2] . '>');
+		$hasAlias = preg_match('/((.*)\s)?<(.+)>/', $string, $matches);
+		if ($smtp && $hasAlias) {
+			return $this->__strip(' <' .  $matches[3] . '>');
+		} elseif ($smtp) {
+			return $this->__strip(' <' . $string . '>');
+		}
+		if ($hasAlias && !empty($matches[2])) {
+			return $this->__strip($matches[2] . ' <' . $matches[3] . '>');
 		}
 		return $this->__strip($string);
 	}

diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
@@ -692,6 +692,15 @@ function testFormatAddressAliases() {
 
 		$result = $this->Controller->EmailTest->formatAddress('<email@example.com>');
 		$this->assertEqual($result, '<email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('email@example.com', true);
+		$this->assertEqual($result, ' <email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('<email@example.com>', true);
+		$this->assertEqual($result, ' <email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('alias name <email@example.com>', true);
+		$this->assertEqual($result, ' <email@example.com>');
 	}
 }
 ?>