mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 10:02:14 +02:00
Code

Fix phpdocs for addrAppend and addrFormat, fixes #81

Browse Source 
Minor code cleanup, remove some local vars
This commit is contained in:
Synchro 2013-07-23 17:34:06 +02:00
parent f3a4f75197
commit 6763d1b6ed
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
class.phpmailer.php
View File

@ -1232,31 +1232,31 @@ class PHPMailer
* Creates recipient headers.
* @access public
* @param string $type
* @param array $addr
* @param array $addr An array of recipient,
* where each recipient is a 2-element indexed array with element 0 containing an address
* and element 1 containing a name, like:
* array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
* @return string
*/
public function addrAppend($type, $addr)
{
$addr_str = $type . ': ';
$addresses = array();
foreach ($addr as $a) {
$addresses[] = $this->addrFormat($a);
}
$addr_str .= implode(', ', $addresses);
$addr_str .= $this->LE;
return $addr_str;
return $type . ': ' . implode(', ', $addresses) . $this->LE;
}
/**
* Formats an address correctly.
* Formats an address for use in a message header.
* @access public
* @param string $addr
* @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
* like array('joe@example.com', 'Joe User')
* @return string
*/
public function addrFormat($addr)
{
if (empty($addr[1])) {
if (empty($addr[1])) { // No name provided
return $this->secureHeader($addr[0]);
} else {
return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . " <" . $this->secureHeader(
@ -1465,10 +1465,7 @@ class PHPMailer
}
}
$from = array();
$from[0][0] = trim($this->From);
$from[0][1] = $this->FromName;
$result .= $this->addrAppend('From', $from);
$result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
// sendmail and mail() extract Cc from the header before sending
if (count($this->cc) > 0) {