upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Add sendmailmode to gui

Browse source 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2018-11-12 23:27:18 +01:00
parent 446d96f3eb
commit 92675a606e
No known key found for this signature in database
GPG key ID: 36E3664E099D0614
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,7 @@ class Mail implements ISettings {
'mail_smtpauth' => $this->config->getSystemValue('mail_smtpauth', false),
'mail_smtpname' => $this->config->getSystemValue('mail_smtpname', ''),
'mail_smtppassword' => $this->config->getSystemValue('mail_smtppassword', ''),
'mail_sendmailmode' => $this->config->getSystemValue('mail_sendmailmode', 'smtp'),
];
if ($parameters['mail_smtppassword'] !== '') {

3
settings/Controller/MailSettingsController.php
View file

@ -91,7 +91,8 @@ class MailSettingsController extends Controller {
$mail_smtphost,
$mail_smtpauthtype,
$mail_smtpauth,
$mail_smtpport) {
$mail_smtpport,
$mail_sendmailmode) {
$params = get_defined_vars();
$configs = [];

2
settings/js/admin.js
View file

@ -158,6 +158,7 @@ $(document).ready(function(){
$('#mail_smtpsecure_label').addClass('hidden');
$('#mail_smtpsecure').addClass('hidden');
$('#mail_credentials').addClass('hidden');
$('#mail_sendmailmode_label, #mail_sendmailmode').removeClass('hidden');
} else {
$('#setting_smtpauth').removeClass('hidden');
$('#setting_smtphost').removeClass('hidden');
@ -166,6 +167,7 @@ $(document).ready(function(){
if ($('#mail_smtpauth').is(':checked')) {
$('#mail_credentials').removeClass('hidden');
}
$('#mail_sendmailmode_label, #mail_sendmailmode').addClass('hidden');
}
});

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

@ -47,6 +47,11 @@ if ($_['mail_smtpmode'] === 'qmail') {
$mail_smtpmode[] = ['qmail', 'qmail'];
}
$mail_sendmailmode = [
'smtp' => 'smtp (-bs)',
'pipe' => 'pipe (-t)'
];
?>
<div class="section" id="mail_general_settings">
@ -84,6 +89,15 @@ if ($_['mail_smtpmode'] === 'qmail') {
<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
<?php endforeach;?>
</select>
<label id="mail_sendmailmode_label" for="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
<?php p($l->t('Sendmail mode')); ?>
</label>
<select name="mail_sendmailmode" id="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
<?php foreach ($mail_sendmailmode as $sendmailmodeValue => $sendmailmodeLabel): ?>
<option value="<?php p($sendmailmodeValue)?>" <?= $sendmailmodeValue === $_['mail_sendmailmode'] ? 'selected="selected"' : '' ?>><?php p($sendmailmodeLabel) ?></option>
<?php endforeach;?>
</select>
</p>
<p>