Don't allow unencrypted IMAP, allow deleting mails
This commit is contained in:
parent
20dc285f9d
commit
16d2f11b40
|
@ -859,12 +859,12 @@ function settings_content(App $a)
|
|||
'$mail_disabled' => $mail_disabled_message,
|
||||
'$mail_server' => ['mail_server', L10n::t('IMAP server name:'), $mail_server, ''],
|
||||
'$mail_port' => ['mail_port', L10n::t('IMAP port:'), $mail_port, ''],
|
||||
'$mail_ssl' => ['mail_ssl', L10n::t('Security:'), strtoupper($mail_ssl), '', ['notls'=>L10n::t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL']],
|
||||
'$mail_ssl' => ['mail_ssl', L10n::t('Security:'), strtoupper($mail_ssl), '', [/*'notls' => L10n::t('None'),*/ 'TLS' => 'TLS', 'SSL' => 'SSL']],
|
||||
'$mail_user' => ['mail_user', L10n::t('Email login name:'), $mail_user, ''],
|
||||
'$mail_pass' => ['mail_pass', L10n::t('Email password:'), '', ''],
|
||||
'$mail_replyto' => ['mail_replyto', L10n::t('Reply-to address:'), $mail_replyto, 'Optional'],
|
||||
'$mail_pubmail' => ['mail_pubmail', L10n::t('Send public posts to all email contacts:'), $mail_pubmail, ''],
|
||||
'$mail_action' => ['mail_action', L10n::t('Action after import:'), $mail_action, '', [0=>L10n::t('None'), /*1=>L10n::t('Delete'),*/ 2=>L10n::t('Mark as seen'), 3=>L10n::t('Move to folder')]],
|
||||
'$mail_action' => ['mail_action', L10n::t('Action after import:'), $mail_action, '', [0 => L10n::t('None'), 1 => L10n::t('Delete'), 2 => L10n::t('Mark as seen'), 3 => L10n::t('Move to folder')]],
|
||||
'$mail_movetofolder' => ['mail_movetofolder', L10n::t('Move to folder:'), $mail_movetofolder, ''],
|
||||
'$submit' => L10n::t('Save Settings'),
|
||||
]);
|
||||
|
|
Loading…
Reference in a new issue