Changeset:
ad664072ddb0
https://sourceforge.net/p/mrbs/hg-code/ci/ad664072ddb055b0a69b4f115e666b16d9727419
Author:
Campbell Morrison <[email protected]>
Date:
Wed Sep 23 10:31:39 2015 +0100
Log message:
Added support for qmail
diffstat:
web/functions_mail.inc | 24 +++++++++++++++---------
web/systemdefaults.inc.php | 2 +-
2 files changed, 16 insertions(+), 10 deletions(-)
diffs (54 lines):
diff -r f07287c0dfb2 -r ad664072ddb0 web/functions_mail.inc
--- a/web/functions_mail.inc Tue Sep 22 21:33:23 2015 +0100
+++ b/web/functions_mail.inc Wed Sep 23 10:31:39 2015 +0100
@@ -1153,6 +1153,17 @@
case 'mail':
$mail->isMail();
break;
+ case 'qmail':
+ $mail->isQmail();
+ break;
+ case 'sendmail':
+ $mail->isSendmail();
+ $mail->Sendmail = $sendmail_settings['path'];
+ if (isset($sendmail_settings['args']) && ($sendmail_settings['args'] !==
''))
+ {
+ $mail->Sendmail .= ' ' . $sendmail_settings['args'];
+ }
+ break;
case 'smtp':
$mail->isSMTP();
$mail->Host = $smtp_settings['host'];
@@ -1162,16 +1173,11 @@
$mail->Username = $smtp_settings['username'];
$mail->Password = $smtp_settings['password'];
break;
- case 'sendmail':
- $mail->isSendmail();
- $mail->Sendmail = $sendmail_settings['path'];
- if (isset($sendmail_settings['args']) && ($sendmail_settings['args'] !==
''))
- {
- $mail->Sendmail .= ' ' . $sendmail_settings['args'];
- }
- break;
default:
- trigger_error("Unknown mail backend '" . $mail_settings['admin_backend']
. "'", E_USER_WARNING);
+ $mail->isMail();
+ trigger_error("Unknown mail backend '" . $mail_settings['admin_backend']
. "'." .
+ " Defaulting to 'mail'.",
+ E_USER_WARNING);
break;
}
diff -r f07287c0dfb2 -r ad664072ddb0 web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Tue Sep 22 21:33:23 2015 +0100
+++ b/web/systemdefaults.inc.php Wed Sep 23 10:31:39 2015 +0100
@@ -957,7 +957,7 @@
// HOW TO EMAIL - BACKEND
// ----------------------
// Set the name of the backend used to transport your mails. Either 'mail',
-// 'smtp' or 'sendmail'. Default is 'mail'.
+// 'smtp', 'sendmail' or 'qmail'. Default is 'mail'.
$mail_settings['admin_backend'] = 'mail';
/*******************
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
