Changeset:
ebfdfcd97573
https://sourceforge.net/p/mrbs/hg-code/ci/ebfdfcd97573ecb254883cf74d967c6b23ebb2f5
Author:
John Beranek <[email protected]>
Date:
Thu Sep 24 20:11:45 2015 +0100
Log message:
Added ability to set path to 'qmail-inject' when using the qmail
email backend.
diffstat:
web/functions_mail.inc | 4 ++++
web/systemdefaults.inc.php | 7 +++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diffs (31 lines):
diff -r a5ca3ce5251a -r ebfdfcd97573 web/functions_mail.inc
--- a/web/functions_mail.inc Thu Sep 24 16:31:34 2015 +0100
+++ b/web/functions_mail.inc Thu Sep 24 20:11:45 2015 +0100
@@ -1171,6 +1171,10 @@
break;
case 'qmail':
$mail->isQmail();
+ if (isset($mail_settings['qmail']['qmail-inject-path']))
+ {
+ $mail->Sendmail = $mail_settings['qmail']['qmail-inject-path'];
+ }
break;
case 'sendmail':
$mail->isSendmail();
diff -r a5ca3ce5251a -r ebfdfcd97573 web/systemdefaults.inc.php
--- a/web/systemdefaults.inc.php Thu Sep 24 16:31:34 2015 +0100
+++ b/web/systemdefaults.inc.php Thu Sep 24 20:11:45 2015 +0100
@@ -972,6 +972,13 @@
$sendmail_settings['args'] = '';
/*******************
+ * Qmail settings
+ */
+
+/* Configures the path to 'qmail-inject', if unset defaults to
'/var/qmail/bin/qmail-inject' */
+$mail_settings['qmail']['qmail-inject-path'] = '/usr/bin/qmail-inject';
+
+/*******************
* SMTP settings
*/
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
