adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding more tests for SMTP address formatting. Fixes #1100

Browse source
This commit is contained in:
mark_story 2010-09-12 11:48:09 -04:00
parent 703344cbae
commit e9d194822d
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cake/libs/controller/components/email.php
View file

@ -743,9 +743,14 @@ class EmailComponent extends Object{
* @access private * @access private
*/ */
function _formatAddress($string, $smtp = false) { function _formatAddress($string, $smtp = false) {
$hasAlias = preg_match('/(.+)\s<(.+)>/', $string, $matches); $hasAlias = preg_match('/((.*)\s)?<(.+)>/', $string, $matches);
if ($hasAlias) { if ($smtp && $hasAlias) {
return $this->_strip($matches[1] . ' <' . $matches[2] . '>'); 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); return $this->_strip($string);
} }

9
cake/tests/cases/libs/controller/components/email.test.php
View file

@ -1178,5 +1178,14 @@ HTMLBLOC;
$result = $this->Controller->EmailTest->formatAddress('<email@example.com>'); $result = $this->Controller->EmailTest->formatAddress('<email@example.com>');
$this->assertEqual($result, '<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>');
} }
} }