diff options
| author | Simon L <szaimen@e.mail.de> | 2023-06-17 18:07:07 +0200 |
|---|---|---|
| committer | Simon L <szaimen@e.mail.de> | 2023-06-17 18:26:34 +0200 |
| commit | 7918bb14c8b3be79266199583b7407e5d0ac8c38 (patch) | |
| tree | 56d9624b00a4f301a7d2b31e71b024b50ff53c47 /apps/settings/templates | |
| parent | bd3f3afcf715ee283f61a45e4a26e566f949a7a5 (diff) | |
| download | nextcloud-server-7918bb14c8b3be79266199583b7407e5d0ac8c38.tar.gz nextcloud-server-7918bb14c8b3be79266199583b7407e5d0ac8c38.zip | |
fix confusion around mail settings
Signed-off-by: Simon L <szaimen@e.mail.de>
Diffstat (limited to 'apps/settings/templates')
| -rw-r--r-- | apps/settings/templates/settings/admin/additional-mail.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index 55c58f4caa5..c6548d88737 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -29,8 +29,8 @@ $mail_smtpauthtype = [ ]; $mail_smtpsecure = [ - '' => $l->t('None'), - 'ssl' => $l->t('SSL/TLS') + '' => $l->t('None/STARTTLS'), + 'ssl' => $l->t('SSL') ]; $mail_smtpmode = [ @@ -72,7 +72,9 @@ $mail_sendmailmode = [ <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"'); @@ -91,11 +93,13 @@ $mail_sendmailmode = [ <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;?> @@ -123,10 +127,8 @@ $mail_sendmailmode = [ <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; ?> |