Kill php mail from settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
65bcef8fb3
commit
0dd4a3e0cf
|
@ -328,24 +328,19 @@ $CONFIG = array(
|
||||||
'mail_smtpdebug' => false,
|
'mail_smtpdebug' => false,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Which mode to use for sending mail: ``sendmail``, ``smtp``, ``qmail`` or
|
* Which mode to use for sending mail: ``sendmail``, ``smtp`` or ``qmail``.
|
||||||
* ``php``.
|
|
||||||
*
|
*
|
||||||
* If you are using local or remote SMTP, set this to ``smtp``.
|
* If you are using local or remote SMTP, set this to ``smtp``.
|
||||||
*
|
*
|
||||||
* If you are using PHP mail you must have an installed and working email system
|
|
||||||
* on the server. The program used to send email is defined in the ``php.ini``
|
|
||||||
* file.
|
|
||||||
*
|
|
||||||
* For the ``sendmail`` option you need an installed and working email system on
|
* For the ``sendmail`` option you need an installed and working email system on
|
||||||
* the server, with ``/usr/sbin/sendmail`` installed on your Unix system.
|
* the server, with ``/usr/sbin/sendmail`` installed on your Unix system.
|
||||||
*
|
*
|
||||||
* For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed
|
* For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed
|
||||||
* on your Unix system.
|
* on your Unix system.
|
||||||
*
|
*
|
||||||
* Defaults to ``php``
|
* Defaults to ``smtp``
|
||||||
*/
|
*/
|
||||||
'mail_smtpmode' => 'php',
|
'mail_smtpmode' => 'smtp',
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This depends on ``mail_smtpmode``. Specify the IP address of your mail
|
* This depends on ``mail_smtpmode``. Specify the IP address of your mail
|
||||||
|
|
|
@ -63,6 +63,10 @@ class Mail implements ISettings {
|
||||||
$parameters['mail_smtppassword'] = '********';
|
$parameters['mail_smtppassword'] = '********';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
|
||||||
|
$parameters['mail_smtpmode'] = 'smtp';
|
||||||
|
}
|
||||||
|
|
||||||
return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
|
return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ $mail_smtpsecure = [
|
||||||
];
|
];
|
||||||
|
|
||||||
$mail_smtpmode = [
|
$mail_smtpmode = [
|
||||||
['php', 'PHP'],
|
|
||||||
['smtp', 'SMTP'],
|
['smtp', 'SMTP'],
|
||||||
];
|
];
|
||||||
if ($_['sendmail_is_available']) {
|
if ($_['sendmail_is_available']) {
|
||||||
|
|
Loading…
Reference in New Issue