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

Manually merge my qmail patches for #126

Browse Source 
Minor cleanups
This commit is contained in:
Synchro 2013-10-29 11:17:57 +01:00
parent ced3e13eec
commit 41415a821f
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
class.phpmailer.php
View File

@ -675,7 +675,7 @@ class PHPMailer
public function isSendmail() public function isSendmail()
{ {
if (!stristr(ini_get('sendmail_path'), 'sendmail')) { if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
$this->Sendmail = '/var/qmail/bin/sendmail'; $this->Sendmail = '/usr/sbin/sendmail';
} }
$this->Mailer = 'sendmail'; $this->Mailer = 'sendmail';
} }
@ -687,9 +687,9 @@ class PHPMailer
public function isQmail() public function isQmail()
{ {
if (stristr(ini_get('sendmail_path'), 'qmail')) { if (stristr(ini_get('sendmail_path'), 'qmail')) {
$this->Sendmail = '/var/qmail/bin/sendmail'; $this->Sendmail = '/var/qmail/bin/qmail-inject';
} }
$this->Mailer = 'sendmail'; $this->Mailer = 'qmail';
} }
/** /**
@ -915,9 +915,8 @@ class PHPMailer
/** /**
* Create a message and send it. * Create a message and send it.
* Uses the sending method specified by $Mailer. * Uses the sending method specified by $Mailer.
* Returns false on error - Use the ErrorInfo variable to view description of the error.
* @throws phpmailerException * @throws phpmailerException
* @return bool * @return bool false on error - See the ErrorInfo property for details of the error.
*/ */
public function send() public function send()
{ {
@ -1015,17 +1014,18 @@ class PHPMailer
// Choose the mailer and send through it // Choose the mailer and send through it
switch ($this->Mailer) { switch ($this->Mailer) {
case 'sendmail': case 'sendmail':
case 'qmail':
return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody); return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
case 'smtp': case 'smtp':
return $this->smtpSend($this->MIMEHeader, $this->MIMEBody); return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
case 'mail': case 'mail':
return $this->mailSend($this->MIMEHeader, $this->MIMEBody); return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
default: default:
if (method_exists($this,$this->Mailer.'Send')) { if (method_exists($this, $this->Mailer.'Send')) {
$sendMethod = $this->Mailer.'Send'; $sendMethod = $this->Mailer.'Send';
return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody); return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
} else { } else {
return $this->mailSend($this->MIMEHeader, $this->MIMEBody); return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
} }
} }
} catch (phpmailerException $e) { } catch (phpmailerException $e) {
@ -1050,9 +1050,17 @@ class PHPMailer
protected function sendmailSend($header, $body) protected function sendmailSend($header, $body)
{ {
if ($this->Sender != '') { if ($this->Sender != '') {
$sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); if ($this->Mailer == 'qmail') {
$sendmail = sprintf("%s -f%s", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
} else {
$sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
}
} else { } else {
$sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail)); if ($this->Mailer == 'qmail') {
$sendmail = sprintf("%s", escapeshellcmd($this->Sendmail));
} else {
$sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
}
} }
if ($this->SingleTo === true) { if ($this->SingleTo === true) {
foreach ($this->SingleToArray as $val) { foreach ($this->SingleToArray as $val) {
@ -1627,7 +1635,11 @@ class PHPMailer
} }
// sendmail and mail() extract Bcc from the header before sending // sendmail and mail() extract Bcc from the header before sending
if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { if ((
$this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
)
and count($this->bcc) > 0
) {
$result .= $this->addrAppend('Bcc', $this->bcc); $result .= $this->addrAppend('Bcc', $this->bcc);
} }

17
test/phpmailerTest.php
View File

@ -976,6 +976,23 @@ EOT;
$this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo); $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
} }
/**
* Test sending using Qmail
*/
public function testQmailSend()
{
//Only run if we have qmail installed
if (file_exists('/var/qmail/bin/qmail-inject')) {
$this->Mail->Body = 'Sending via qmail';
$this->BuildBody();
$subject = $this->Mail->Subject;
$this->Mail->Subject = $subject . ': qmail';
$this->Mail->IsQmail();
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
}
}
/** /**
* Test sending using PHP mail() function * Test sending using PHP mail() function
*/ */