mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add somewhat more robust handling of input email addresses (not just bare)

This commit is contained in:
William Barath 2013-11-26 01:44:05 -08:00
parent 0962b82b77
commit 7329b6de09
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
class.phpmailer.php
View File

@ -699,6 +699,27 @@ class PHPMailer
$this->Mailer = 'qmail';
}
/**
* Accepts bare email and name, or a fancy address ie "Foo" (Bar) <baz@qux.net>
* Returns the bare address and trimmed name
*
* @param type $address
* @param type $name
* @return array
*/
function cleanAddress($address, $name = '')
{
if (count($parts=preg_split('/[<[]/',$address))==2){
$address=trim(substr($parts[1],0,-1),']> ');
$name=$parts[0]; //
}
else {
$address=trim($address);
}
$name = trim(preg_replace('/["\r\n]+/', '', $name)); //Strip quotes, breaks and trim
return compact(array("address","name"));
}/**/
/**
* Add a "To" address.
* @param string $address
@ -765,8 +786,7 @@ class PHPMailer
$this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
return false;
}
$address = trim($address);
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
extract($this->cleanAddress($address,$name));
if (!$this->validateAddress($address)) {
$this->setError($this->lang('invalid_address') . ': ' . $address);
if ($this->exceptions) {
@ -800,8 +820,7 @@ class PHPMailer
*/
public function setFrom($address, $name = '', $auto = true)
{
$address = trim($address);
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
extract($this->cleanAddress($address,$name));
if (!$this->validateAddress($address)) {
$this->setError($this->lang('invalid_address') . ': ' . $address);
if ($this->exceptions) {