Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable27] fix confusion around mail settings and improve layout a bit #38885

Merged
merged 1 commit into from Jun 19, 2023
Merged

[stable27] fix confusion around mail settings and improve layout a bit #38885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions apps/settings/templates/settings/admin/additional-mail.php
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
];

$mail_smtpsecure = [
'' => $l->t('None'),
'ssl' => $l->t('SSL/TLS')
'' => $l->t('None/STARTTLS'),
'ssl' => $l->t('SSL')
];

$mail_smtpmode = [
Expand Down Expand Up @@ -72,7 +72,9 @@
<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
<?php endforeach;?>
</select>
</p>

<p>
<label id="mail_smtpsecure_label" for="mail_smtpsecure"
<?php if ($_['mail_smtpmode'] !== 'smtp') {
print_unescaped(' class="hidden"');
Expand All @@ -91,11 +93,13 @@
<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
<?php endforeach;?>
</select>
</p>

<label id="mail_sendmailmode_label" for="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
<p class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
<label id="mail_sendmailmode_label" for="mail_sendmailmode">
<?php p($l->t('Sendmail mode')); ?>
</label>
<select name="mail_sendmailmode" id="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
<select name="mail_sendmailmode" id="mail_sendmailmode">
<?php foreach ($mail_sendmailmode as $sendmailmodeValue => $sendmailmodeLabel): ?>
<option value="<?php p($sendmailmodeValue)?>" <?= $sendmailmodeValue === $_['mail_sendmailmode'] ? 'selected="selected"' : '' ?>><?php p($sendmailmodeLabel) ?></option>
<?php endforeach;?>
Expand Down Expand Up @@ -123,10 +127,8 @@
<p id='setting_smtpauth' <?php if ($_['mail_smtpmode'] !== 'smtp') {
print_unescaped(' class="hidden"');
} ?>>
<label for='mail_smtpauthtype'><?php p($l->t('Authentication method')); ?>
<span class="icon-info" title="<?php p($l->t('Only applies when authentication is required')); ?>"></span>
</label>
<select name="mail_smtpauthtype" id="mail_smtpauthtype" disabled="disabled">
<label for='mail_smtpauthtype'><?php p($l->t('Authentication')); ?></label>
<select name="mail_smtpauthtype" id="mail_smtpauthtype" class="hidden">
<?php foreach ($mail_smtpauthtype as $authtype => $name): ?>
<option value="<?php p($authtype) ?>"><?php p($name) ?></option>
<?php endforeach; ?>
Expand Down