Merge remote-tracking branch 'upstream/develop' into nodeinfo

diff --git a/mod/settings.php b/mod/settings.php
index fcc2cad36950f9b0a196be293489e047653f49ec..45867c7ef9b066b09c8640fb6e562fac2b390de3 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -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"),
@@ -857,15 +863,15 @@ function settings_content(App $a)
                        '$imap_desc' => L10n::t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
                        '$imap_lastcheck' => ['imap_lastcheck', L10n::t('Last successful email check:'), $mail_chk, ''],
                        '$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_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_movetofolder'    => ['mail_movetofolder',         L10n::t('Move to folder:'), $mail_movetofolder, ''],
+                       '$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), '', $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_movetofolder' => ['mail_movetofolder', L10n::t('Move to folder:'), $mail_movetofolder, ''],
                        '$submit' => L10n::t('Save Settings'),
                ]);
 

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 0cfb15e8474149b50bbfef40cc647d47026c1cd0..a4fd11662fd34c5fe38da7b5033aed93491cf01b 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -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.