sforkowany z mirror/friendica
Merge remote-tracking branch 'upstream/develop' into nodeinfo
commit
2d3296f697
|
@ -829,7 +829,13 @@ function settings_content(App $a)
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate('settings/connectors.tpl');
|
||||
|
||||
$mail_disabled_message = (($mail_disabled) ? L10n::t('Email access is disabled on this site.') : '');
|
||||
$mail_disabled_message = ($mail_disabled ? L10n::t('Email access is disabled on this site.') : '');
|
||||
|
||||
$ssl_options = ['TLS' => 'TLS', 'SSL' => 'SSL'];
|
||||
|
||||
if (Config::get('system', 'insecure_imap')) {
|
||||
$ssl_options['notls'] = L10n::t('None');
|
||||
}
|
||||
|
||||
$o .= Renderer::replaceMacros($tpl, [
|
||||
'$form_security_token' => BaseModule::getFormSecurityToken("settings_connectors"),
|
||||
|
@ -859,12 +865,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), '', $ssl_options],
|
||||
'$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'),
|
||||
]);
|
||||
|
|
|
@ -189,6 +189,11 @@ return [
|
|||
// For development only. Disables the item cache.
|
||||
'ignore_cache' => false,
|
||||
|
||||
// insecure_imap (Boolean)
|
||||
// If enabled, users are allowed to connect to their IMAP servers unencrypted.
|
||||
// For security reasons this is disabled by default.
|
||||
'insecure_imap' => false,
|
||||
|
||||
// instances_social_key (String)
|
||||
// Key to the API of https://instances.social which retrieves data about mastodon servers.
|
||||
// See https://instances.social/api/token to get an API key.
|
||||
|
|
Ładowanie…
Reference in New Issue