if (count($this->recipients)) {
$recpt = '';
foreach ($this->recipients as $address) {
- if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
- else { $recpt .= $address['mail'].','; }
+ if (strlen(@$address['mail'])) {
+ if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
+ else { $recpt .= $address['mail'].','; }
+ }
}
$recpt = preg_replace('/,$/', '', $recpt);
}
+ if (!strlen($recpt)) {
+ return null;
+ }
if (count($this->cc)) {
$adrs = '';
foreach ($this->cc as $address) {
foreach ($this->attachments as $attach) {
$mtxt .= "\n".'--'.$boundary."\n";
$mtxt .= 'Content-Type: '.$attach['type'].'; name="'.$attach['name'].'";'."\n";
- $mtxt .= 'Content-Transfer-Encoding: base64'."\n";
- $mtxt .= 'Content-Disposition: attachment'."\n\n";
- $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ;
- $mtxt .= "\n";
+ if (preg_match('/^(text|message)\//', $attach['type'])) {
+ $mtxt .= 'Content-Transfer-Encoding: 8bit'."\n";
+ $mtxt .= 'Content-Disposition: attachment'."\n\n";
+ $mtxt .= $attach['content'];
+ $mtxt .= "\n";
+ }
+ else {
+ $mtxt .= 'Content-Transfer-Encoding: base64'."\n";
+ $mtxt .= 'Content-Disposition: attachment'."\n\n";
+ $mtxt .= rtrim(chunk_split(base64_encode($attach['content']), 76)); ;
+ $mtxt .= "\n";
+ }
}
- $mtext .= '--'.$boundary.'--'."\n";
+ $mtxt .= '--'.$boundary.'--'."\n";
}
if (strlen($this->debug_toSingleAddress)) {