adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2499 from ADmad/2.5-cakeemail

Browse source 
By default use filter_var() to valid email addresses in CakeEmail.
This commit is contained in:
Mark Story 2013-12-17 16:52:23 -08:00
commit 54a65f98da
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/Cake/Network/Email/CakeEmail.php
View file

@ -16,7 +16,6 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('Validation', 'Utility');
App::uses('Multibyte', 'I18n');
App::uses('AbstractTransport', 'Network/Email');
App::uses('File', 'Utility');
@ -317,7 +316,7 @@ class CakeEmail {
/**
* Regex for email validation
* If null, it will use built in regex
* If null, filter_var() will be used.
*
* @var string
*/
@ -554,13 +553,10 @@ class CakeEmail {
* @param string|array $email
* @param string $name
* @return CakeEmail $this
* @throws SocketException
*/
protected function _setEmail($varName, $email, $name) {
if (!is_array($email)) {
if (!Validation::email($email, false, $this->_emailPattern)) {
throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
}
$this->_validateEmail($email);
if ($name === null) {
$name = $email;
}
@ -572,15 +568,30 @@ class CakeEmail {
if (is_int($key)) {
$key = $value;
}
if (!Validation::email($key, false, $this->_emailPattern)) {
throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $key));
}
$this->_validateEmail($key);
$list[$key] = $value;
}
$this->{$varName} = $list;
return $this;
}
/**
* Validate email address
*
* @param string $email
* @return void
* @throws SocketException If email address does not validate
*/
protected function _validateEmail($email) {
$valid = (($this->_emailPattern !== null &&
preg_match($this->_emailPattern, $email)) ||
filter_var($email, FILTER_VALIDATE_EMAIL)
);
if (!$valid) {
throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
}
}
/**
* Set only 1 email
*
@ -612,9 +623,7 @@ class CakeEmail {
*/
protected function _addEmail($varName, $email, $name) {
if (!is_array($email)) {
if (!Validation::email($email, false, $this->_emailPattern)) {
throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
}
$this->_validateEmail($email);
if ($name === null) {
$name = $email;
}
@ -626,9 +635,7 @@ class CakeEmail {
if (is_int($key)) {
$key = $value;
}
if (!Validation::email($key, false, $this->_emailPattern)) {
throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $key));
}
$this->_validateEmail($key);
$list[$key] = $value;
}
$this->{$varName} = array_merge($this->{$varName}, $list);

3
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -271,6 +271,9 @@ class CakeEmailTest extends CakeTestCase {
);
$this->assertSame($this->CakeEmail->to(), $expected);
$this->assertSame($this->CakeEmail, $result);
$this->setExpectedException('SocketException');
$this->CakeEmail->to(array('cake@localhost', 'CakePHP'));
}
/**