wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill php mail from settings

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-06-07 20:36:17 +02:00
parent 65bcef8fb3
commit 0dd4a3e0cf
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config/config.sample.php
View file

@ -328,24 +328,19 @@ $CONFIG = array(
'mail_smtpdebug' => false,
/**
* Which mode to use for sending mail: ``sendmail``, ``smtp``, ``qmail`` or
* ``php``.
* Which mode to use for sending mail: ``sendmail``, ``smtp`` or ``qmail``.
*
* 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
* 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
* 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

4
lib/private/Settings/Admin/Mail.php
View file

@ -63,6 +63,10 @@ class Mail implements ISettings {
$parameters['mail_smtppassword'] = '********';
}
if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
$parameters['mail_smtpmode'] = 'smtp';
}
return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
}

1
settings/templates/settings/admin/additional-mail.php
View file

@ -38,7 +38,6 @@ $mail_smtpsecure = [
];
$mail_smtpmode = [
['php', 'PHP'],
['smtp', 'SMTP'],
];
if ($_['sendmail_is_available']) {