From 879168a8bdb6babeee84831c8fbc363e5fd7b5b3 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Thu, 25 Apr 2024 17:49:06 -0400 Subject: [PATCH] Remove encryption setting on backend mail settings page & config (#1084) The "encryption" option is redundant as encryption is always forced for port 465 & encryption will be automatically enabled using STARTTLS for other ports (e.g. 25 and 587) if available from the mail server CAPABILITIES by the underlying Laravel & Symfony libaries. --- lang/be/lang.php | 5 ----- lang/bg/lang.php | 5 ----- lang/ca/lang.php | 5 ----- lang/cs/lang.php | 5 ----- lang/da/lang.php | 5 ----- lang/de/lang.php | 5 ----- lang/el/lang.php | 5 ----- lang/en/lang.php | 5 ----- lang/es-ar/lang.php | 1 - lang/es/lang.php | 5 ----- lang/et/lang.php | 5 ----- lang/fa/lang.php | 5 ----- lang/fi/lang.php | 5 ----- lang/fr/lang.php | 5 ----- lang/hu/lang.php | 5 ----- lang/id/lang.php | 1 - lang/it/lang.php | 5 ----- lang/ja/lang.php | 3 --- lang/kr/lang.php | 5 ----- lang/lt/lang.php | 5 ----- lang/lv/lang.php | 5 ----- lang/nb-no/lang.php | 5 ----- lang/nl/lang.php | 5 ----- lang/pl/lang.php | 5 ----- lang/pt-br/lang.php | 5 ----- lang/pt-pt/lang.php | 5 ----- lang/ro/lang.php | 5 ----- lang/rs/lang.php | 5 ----- lang/ru/lang.php | 5 ----- lang/sk/lang.php | 5 ----- lang/sl/lang.php | 5 ----- lang/sv/lang.php | 5 ----- lang/th/lang.php | 5 ----- lang/tr/lang.php | 5 ----- lang/uk/lang.php | 5 ----- lang/vn/lang.php | 5 ----- lang/zh-cn/lang.php | 1 - lang/zh-tw/lang.php | 1 - models/MailSetting.php | 41 ++++------------------------------ models/mailsetting/fields.yaml | 13 ++--------- 40 files changed, 6 insertions(+), 220 deletions(-) diff --git a/lang/be/lang.php b/lang/be/lang.php index ad88c7a6..92e5fb7a 100644 --- a/lang/be/lang.php +++ b/lang/be/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => "Імя", 'smtp_password' => "Пароль", 'smtp_port' => "Порт SMTP", - 'smtp_ssl' => "Патрабуецца падключэнне SSL", - 'smtp_encryption' => "Пратакол шыфравання SMTP", - 'smtp_encryption_none' => "Няма шыфравання", - 'smtp_encryption_tls' => "TLS", - 'smtp_encryption_ssl' => "SSL", 'sendmail' => "Sendmail", 'sendmail_path' => "Шлях sendmail", 'sendmail_path_comment' => "Калі ласка, укажыце шлях дла праграмы sendmail", diff --git a/lang/bg/lang.php b/lang/bg/lang.php index 854cb9ae..cbe3aa59 100644 --- a/lang/bg/lang.php +++ b/lang/bg/lang.php @@ -124,11 +124,6 @@ 'smtp_username' => 'Потребител', 'smtp_password' => 'парола', 'smtp_port' => 'SMTP порт', - 'smtp_ssl' => 'SSL връзка се изисква.', - 'smtp_encryption' => 'SMTP протокол за криптиране', - 'smtp_encryption_none' => 'Без криптиране', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail директория', 'sendmail_path_comment' => 'Моля, посочете директория на Sendmail програмата.', diff --git a/lang/ca/lang.php b/lang/ca/lang.php index 6252ae0e..1f754af1 100644 --- a/lang/ca/lang.php +++ b/lang/ca/lang.php @@ -133,11 +133,6 @@ 'smtp_username' => "Nom d'usuari", 'smtp_password' => 'Contrasenya', 'smtp_port' => 'Port SMTP', - 'smtp_ssl' => 'Connexió SSL requerida', - 'smtp_encryption' => "Protocol d'encriptació SMTP", - 'smtp_encryption_none' => 'Sense encriptació', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ruta de sendmail', 'sendmail_path_comment' => "Si us plau especifica una ruta per l'executable de sendmail.", diff --git a/lang/cs/lang.php b/lang/cs/lang.php index 20895d39..be78941a 100644 --- a/lang/cs/lang.php +++ b/lang/cs/lang.php @@ -128,11 +128,6 @@ 'smtp_username' => 'Uživatelské jméno', 'smtp_password' => 'Heslo', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'Vyžadováno SSL připojení', - 'smtp_encryption' => 'SMTP šifrovací protokol', - 'smtp_encryption_none' => 'Bez šifrování', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cesta', 'sendmail_path_comment' => 'Zadejte prosím cestu k sendmail programu.', diff --git a/lang/da/lang.php b/lang/da/lang.php index 4c509602..f4e707e4 100644 --- a/lang/da/lang.php +++ b/lang/da/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => 'Brugernavn', 'smtp_password' => 'Adgangskode', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'SSL forbindelse påkrævet', - 'smtp_encryption' => 'SMTP krypteringsprotokol', - 'smtp_encryption_none' => 'Ingen kryptering', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail sti', 'sendmail_path_comment' => 'Angiv venligst stien til sendmail programmet.', diff --git a/lang/de/lang.php b/lang/de/lang.php index c22e7719..c3774e77 100644 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -140,11 +140,6 @@ 'smtp_username' => 'Benutzername', 'smtp_password' => 'Passwort', 'smtp_port' => 'SMTP-Port', - 'smtp_ssl' => 'SSL-Verbindung erforderlich', - 'smtp_encryption' => 'SMTP-Verschlüsselungs-Protokoll', - 'smtp_encryption_none' => 'Keine Verschlüsselung', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-Pfad', 'sendmail_path_comment' => 'Bitte geben Sie den (absoluten) Pfad zum Sendmail-Programm an.', diff --git a/lang/el/lang.php b/lang/el/lang.php index 46df5a48..c0d4a700 100644 --- a/lang/el/lang.php +++ b/lang/el/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => 'Όνομα Χρήστη', 'smtp_password' => 'Κωδικός', 'smtp_port' => 'SMTP Port', - 'smtp_ssl' => 'Απαιτείται SSL σύνδεση', - 'smtp_encryption' => 'Πρωτόκολλο κρυπτογράφησης SMTP', - 'smtp_encryption_none' => 'Χωρίς κρυπτογράφηση', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Διαδρομή Sendmail', 'sendmail_path_comment' => 'Παρακαλούμε καθορίστε την διαδρομή του λογισμικού Sendmail.', diff --git a/lang/en/lang.php b/lang/en/lang.php index 023b10d6..8c5eb300 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -185,11 +185,6 @@ 'smtp_username' => 'Username', 'smtp_password' => 'Password', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'SSL connection required', - 'smtp_encryption' => 'SMTP encryption protocol', - 'smtp_encryption_none' => 'No encryption', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', diff --git a/lang/es-ar/lang.php b/lang/es-ar/lang.php index e41530a3..b2abe068 100644 --- a/lang/es-ar/lang.php +++ b/lang/es-ar/lang.php @@ -92,7 +92,6 @@ 'smtp_username' => 'Nombre de usuario', 'smtp_password' => 'Contraseña', 'smtp_port' => 'Puerto SMTP', - 'smtp_ssl' => 'Conexión SSL requerida', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ruta del Sendmail', 'sendmail_path_comment' => 'Por favor, especifique la ruta del programa sendmail.', diff --git a/lang/es/lang.php b/lang/es/lang.php index cd493add..8bddae32 100644 --- a/lang/es/lang.php +++ b/lang/es/lang.php @@ -126,11 +126,6 @@ 'smtp_username' => 'Nombre de usuario', 'smtp_password' => 'Contraseña', 'smtp_port' => 'Puerto SMTP', - 'smtp_ssl' => 'Conexión SSL requerida', - 'smtp_encryption' => 'protocolo SMTP encryptado', - 'smtp_encryption_none' => 'Sin encryptación', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Directorio de Sendmail', 'sendmail_path_comment' => 'Por favor, especifique la ruta de acceso del programa sendmail.', diff --git a/lang/et/lang.php b/lang/et/lang.php index d21cf16f..15a1ece8 100644 --- a/lang/et/lang.php +++ b/lang/et/lang.php @@ -164,11 +164,6 @@ 'smtp_username' => 'Kasutjanimi', 'smtp_password' => 'Parool', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'SSL ühendus', - 'smtp_encryption' => 'SMTP krüpteerimise protokoll', - 'smtp_encryption_none' => 'Krüpteerimist ei kasutata', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmaili asukoht', 'sendmail_path_comment' => 'Palun sisesta sendmail programmi asukoht.', diff --git a/lang/fa/lang.php b/lang/fa/lang.php index 73c8b232..54b9d9f0 100644 --- a/lang/fa/lang.php +++ b/lang/fa/lang.php @@ -182,11 +182,6 @@ 'smtp_username' => 'نام کاربری', 'smtp_password' => 'کلمه عبور', 'smtp_port' => 'درگاه SMTP', - 'smtp_ssl' => 'اتصال امن SSL مورد نیاز است', - 'smtp_encryption' => 'پروتکل رمزگذاری SMTP', - 'smtp_encryption_none' => 'بدون رمزگذاری', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'آدرس برنامه Sendmail', 'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.', diff --git a/lang/fi/lang.php b/lang/fi/lang.php index c11f57e0..c8604ed5 100644 --- a/lang/fi/lang.php +++ b/lang/fi/lang.php @@ -169,11 +169,6 @@ 'smtp_username' => 'Käyttäjätunnus', 'smtp_password' => 'Salasana', 'smtp_port' => 'SMTP-portti', - 'smtp_ssl' => 'SSL-yhteys vaaditaan', - 'smtp_encryption' => 'SMTP-salausprotokolla', - 'smtp_encryption_none' => 'Ei salausta', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-polku', 'sendmail_path_comment' => 'Määritä polku sendmail-ohjelmaan.', diff --git a/lang/fr/lang.php b/lang/fr/lang.php index 755c8565..57a25e47 100644 --- a/lang/fr/lang.php +++ b/lang/fr/lang.php @@ -139,11 +139,6 @@ 'smtp_username' => 'Identifiant', 'smtp_password' => 'Mot de passe', 'smtp_port' => 'Port SMTP', - 'smtp_ssl' => 'Connexion SSL requise', - 'smtp_encryption' => 'Protocole de sécurisation des échanges SMTP', - 'smtp_encryption_none' => 'Aucun cryptage', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Chemin vers Sendmail', 'sendmail_path_comment' => 'Saisir le chemin du programme sendmail.', diff --git a/lang/hu/lang.php b/lang/hu/lang.php index 2637ddd9..9773adce 100644 --- a/lang/hu/lang.php +++ b/lang/hu/lang.php @@ -139,11 +139,6 @@ 'smtp_username' => 'Felhasználónév', 'smtp_password' => 'Jelszó', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'SSL kapcsolat szükséges', - 'smtp_encryption' => 'SMTP titkosítás típusa', - 'smtp_encryption_none' => 'Nincs', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Elérési út', 'sendmail_path_comment' => 'Adja meg a Sendmail elérését.', diff --git a/lang/id/lang.php b/lang/id/lang.php index 34181dcd..68e886f8 100644 --- a/lang/id/lang.php +++ b/lang/id/lang.php @@ -95,7 +95,6 @@ 'smtp_username' => 'Nama pengguna', 'smtp_password' => 'Sandi lewat', 'smtp_port' => 'Porta SMTP', - 'smtp_ssl' => 'Koneksi SSL diperlukan', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Jalur Sendmail', 'sendmail_path_comment' => 'Silakan tentukan jalur ke program sendmail.', diff --git a/lang/it/lang.php b/lang/it/lang.php index aae1390e..dbb48e48 100644 --- a/lang/it/lang.php +++ b/lang/it/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => 'Username', 'smtp_password' => 'Password', 'smtp_port' => 'Porta SMTP', - 'smtp_ssl' => 'Connessione SSL richiesta', - 'smtp_encryption' => 'Protocollo di crittografia SMTP', - 'smtp_encryption_none' => 'Nessuna crittografia', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Percorso Sendmail', 'sendmail_path_comment' => 'Inserisci il percorso al servizio sendmail.', diff --git a/lang/ja/lang.php b/lang/ja/lang.php index bd19cf9e..d922ea6a 100644 --- a/lang/ja/lang.php +++ b/lang/ja/lang.php @@ -148,9 +148,6 @@ 'smtp_username' => 'ユーザー名', 'smtp_password' => 'パスワード', 'smtp_port' => 'SMTPポート', - 'smtp_ssl' => 'SSL接続が必要', - 'smtp_encryption' => 'SMTP暗号化プロトコル', - 'smtp_encryption_none' => '暗号化しない', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmailパス', 'sendmail_path_comment' => 'Sendmailプログラムへのパスを指定してください。', diff --git a/lang/kr/lang.php b/lang/kr/lang.php index 465f942d..9e602d3b 100644 --- a/lang/kr/lang.php +++ b/lang/kr/lang.php @@ -126,11 +126,6 @@ 'smtp_username' => '유저이름', 'smtp_password' => '비밀번호', 'smtp_port' => 'SMTP포트', - 'smtp_ssl' => 'SSL접속여부', - 'smtp_encryption' => 'SMTP 암호 프로토콜', - 'smtp_encryption_none' => '비 암호화', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 경로', 'sendmail_path_comment' => 'Sendmail프로그램의 경로를 설정해주세요.', diff --git a/lang/lt/lang.php b/lang/lt/lang.php index 767c8c9e..2b237a1e 100644 --- a/lang/lt/lang.php +++ b/lang/lt/lang.php @@ -162,11 +162,6 @@ 'smtp_username' => 'Vartotojas', 'smtp_password' => 'Slaptažodis', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'SSL jungtis reikalinga', - 'smtp_encryption' => 'SMTP šifravimo protokolas', - 'smtp_encryption_none' => 'Be šifravimo', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail kelias', 'sendmail_path_comment' => 'Nurodykite kelią į sendmail programą.', diff --git a/lang/lv/lang.php b/lang/lv/lang.php index f7e33a3e..875ffc9e 100644 --- a/lang/lv/lang.php +++ b/lang/lv/lang.php @@ -185,11 +185,6 @@ 'smtp_username' => 'Lietotājvārds', 'smtp_password' => 'Parole', 'smtp_port' => 'SMTP ports', - 'smtp_ssl' => 'Nepieciešams SSL savienojums', - 'smtp_encryption' => 'SMTP šifrēšanas protokols', - 'smtp_encryption_none' => 'Bez šifrēšanas', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail ceļš', 'sendmail_path_comment' => 'Lūdzu, norādiet ceļu uz sendmail programmu.', diff --git a/lang/nb-no/lang.php b/lang/nb-no/lang.php index b2dc6a1c..326a0591 100644 --- a/lang/nb-no/lang.php +++ b/lang/nb-no/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => 'Brukernavn', 'smtp_password' => 'Passord', 'smtp_port' => 'SMTP-port', - 'smtp_ssl' => 'SSL-tilkobling påkrevd', - 'smtp_encryption' => 'SMTP krypteringsprotkoll', - 'smtp_encryption_none' => 'Ingen kryptering', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-sti', 'sendmail_path_comment' => 'Vennligst oppgi stien til sendmail-programmet.', diff --git a/lang/nl/lang.php b/lang/nl/lang.php index c7eb9f45..445c0827 100644 --- a/lang/nl/lang.php +++ b/lang/nl/lang.php @@ -179,11 +179,6 @@ 'smtp_username' => 'Gebruikersnaam', 'smtp_password' => 'Wachtwoord', 'smtp_port' => 'SMTP poort', - 'smtp_ssl' => 'SSL verbinding vereist', - 'smtp_encryption' => 'SMTP encryptie protocol', - 'smtp_encryption_none' => 'Geen encryptie', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Pad naar Sendmail', 'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.', diff --git a/lang/pl/lang.php b/lang/pl/lang.php index 12bd9723..7a827aaf 100644 --- a/lang/pl/lang.php +++ b/lang/pl/lang.php @@ -143,11 +143,6 @@ 'smtp_username' => 'Użytkownik', 'smtp_password' => 'Hasło', 'smtp_port' => 'Port SMTP', - 'smtp_ssl' => 'Połączenie SSL wymagane', - 'smtp_encryption' => 'Protokół szyfrowania SMTP', - 'smtp_encryption_none' => 'Bez szyfrowania', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ścieżka Sendmail', 'sendmail_path_comment' => 'Proszę podać ścieżkę programu sendmail.', diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php index 0a20f166..fe8bc624 100644 --- a/lang/pt-br/lang.php +++ b/lang/pt-br/lang.php @@ -179,11 +179,6 @@ 'smtp_username' => 'Usuário', 'smtp_password' => 'Senha', 'smtp_port' => 'Porta SMTP', - 'smtp_ssl' => 'Conexão SSL obrigatória', - 'smtp_encryption' => 'Protocolo de criptografia SMTP', - 'smtp_encryption_none' => 'Sem criptografia', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', diff --git a/lang/pt-pt/lang.php b/lang/pt-pt/lang.php index e79fddbe..98500bc4 100644 --- a/lang/pt-pt/lang.php +++ b/lang/pt-pt/lang.php @@ -162,11 +162,6 @@ 'smtp_username' => 'Utilizador', 'smtp_password' => 'Senha', 'smtp_port' => 'Porta SMTP', - 'smtp_ssl' => 'Conexão SSL obrigatória', - 'smtp_encryption' => 'Protocolo de criptografia SMTP', - 'smtp_encryption_none' => 'Sem criptografia', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', diff --git a/lang/ro/lang.php b/lang/ro/lang.php index 20ddb31d..e4550318 100644 --- a/lang/ro/lang.php +++ b/lang/ro/lang.php @@ -182,11 +182,6 @@ 'smtp_username' => 'Nume utilizator', 'smtp_password' => 'Parolă', 'smtp_port' => 'Port SMTP', - 'smtp_ssl' => 'Conexiune SSL necesară', - 'smtp_encryption' => 'Protocol de criptare SMTP', - 'smtp_encryption_none' => 'Fără criptare', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Calea către Sendmail', 'sendmail_path_comment' => 'Vă rugăm să specificați calea programului Sendmail.', diff --git a/lang/rs/lang.php b/lang/rs/lang.php index aa710cb2..81ea2b47 100644 --- a/lang/rs/lang.php +++ b/lang/rs/lang.php @@ -179,11 +179,6 @@ 'smtp_username' => 'Korisničko ime', 'smtp_password' => 'Lozinka', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'Potrebna SSL konekcija', - 'smtp_encryption' => 'SMTP šifarski protokol', - 'smtp_encryption_none' => 'Bez šifrovanja', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail putanja', 'sendmail_path_comment' => 'Specificiraj putanju Sendmail programa.', diff --git a/lang/ru/lang.php b/lang/ru/lang.php index f9f95a17..34489588 100644 --- a/lang/ru/lang.php +++ b/lang/ru/lang.php @@ -185,11 +185,6 @@ 'smtp_username' => 'SMTP логин', 'smtp_password' => 'SMTP пароль', 'smtp_port' => 'SMTP порт', - 'smtp_ssl' => 'Использовать SSL', - 'smtp_encryption' => 'Протокол шифрования для SMTP', - 'smtp_encryption_none' => 'Без шифрования', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Путь к Sendmail', 'sendmail_path_comment' => 'Пожалуйста, укажите путь к sendmail.', diff --git a/lang/sk/lang.php b/lang/sk/lang.php index f3e7cfac..44360a97 100644 --- a/lang/sk/lang.php +++ b/lang/sk/lang.php @@ -180,11 +180,6 @@ 'smtp_username' => 'Užívateľské meno', 'smtp_password' => 'Heslo', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'Vyžadované SSL pripojenie', - 'smtp_encryption' => 'SMTP šifrovací protokol', - 'smtp_encryption_none' => 'Bez šifrovania', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cest', 'sendmail_path_comment' => 'Prosím zadajte cestu k sendmail programu.', diff --git a/lang/sl/lang.php b/lang/sl/lang.php index 2506b35f..11352cf4 100644 --- a/lang/sl/lang.php +++ b/lang/sl/lang.php @@ -179,11 +179,6 @@ 'smtp_username' => 'Uporabniško ime', 'smtp_password' => 'Geslo', 'smtp_port' => 'SMTP vrata (port)', - 'smtp_ssl' => 'Obvezna SSL povezava', - 'smtp_encryption' => 'Enkripcijski protokol za SMTP', - 'smtp_encryption_none' => 'Brez enkripcije', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail lokacija', 'sendmail_path_comment' => 'Določite lokacijo Sendmail programa.', diff --git a/lang/sv/lang.php b/lang/sv/lang.php index fddae9e8..fa359296 100644 --- a/lang/sv/lang.php +++ b/lang/sv/lang.php @@ -125,11 +125,6 @@ 'smtp_username' => 'Användarnamn', 'smtp_password' => 'Lösenord', 'smtp_port' => 'SMTP-port', - 'smtp_ssl' => 'SSL-anslutning krävs', - 'smtp_encryption' => 'SMTP-krypteringsprotokoll', - 'smtp_encryption_none' => 'Ingen kryptering', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-sökväg', 'sendmail_path_comment' => 'Vänligen ange sökvägen till sendmail', diff --git a/lang/th/lang.php b/lang/th/lang.php index cd4bb4b4..0ec75f8e 100644 --- a/lang/th/lang.php +++ b/lang/th/lang.php @@ -133,11 +133,6 @@ 'smtp_username' => 'ชื่อผู้ใช้', 'smtp_password' => 'รหัสผ่าน', 'smtp_port' => 'พอร์ท SMTP', - 'smtp_ssl' => 'ต้องมีการเชื่อมต่อ SSL', - 'smtp_encryption' => 'โปรโตคอลการเข้ารหัส SMTP', - 'smtp_encryption_none' => 'ไม่เข้ารหัส', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'กรุณากำหนด path ของโปรแกรม sendmail', diff --git a/lang/tr/lang.php b/lang/tr/lang.php index 6b77d24f..7cf40cdf 100644 --- a/lang/tr/lang.php +++ b/lang/tr/lang.php @@ -185,11 +185,6 @@ 'smtp_username' => 'Kullanıcı Adı', 'smtp_password' => 'Şifre', 'smtp_port' => 'SMTP Port', - 'smtp_ssl' => 'SSL bağlantısı kullan', - 'smtp_encryption' => 'SMTP şifreleme protokolü', - 'smtp_encryption_none' => 'Şifreleme yok', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail Yolu', 'sendmail_path_comment' => 'Sendmail programının yolunu belirtin.', diff --git a/lang/uk/lang.php b/lang/uk/lang.php index 1d1fe69e..16de8ff0 100644 --- a/lang/uk/lang.php +++ b/lang/uk/lang.php @@ -185,11 +185,6 @@ 'smtp_username' => 'SMTP логін', 'smtp_password' => 'SMTP пароль', 'smtp_port' => 'SMTP порт', - 'smtp_ssl' => 'Використовувати SSL', - 'smtp_encryption' => 'Протокол шифрування для SMTP', - 'smtp_encryption_none' => 'Без шифрування', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail шлях', 'sendmail_path_comment' => 'Будь ласка, вкажіть шлях до sendmail.', diff --git a/lang/vn/lang.php b/lang/vn/lang.php index 82554ea4..dd59be33 100644 --- a/lang/vn/lang.php +++ b/lang/vn/lang.php @@ -170,11 +170,6 @@ 'smtp_username' => 'Tên đăng nhập', 'smtp_password' => 'Mật khẩu', 'smtp_port' => 'SMTP port', - 'smtp_ssl' => 'Yêu cầu sử dụng SSL', - 'smtp_encryption' => 'Giao thức mã hóa SMTP', - 'smtp_encryption_none' => 'Không mã hóa', - 'smtp_encryption_tls' => 'TLS', - 'smtp_encryption_ssl' => 'SSL', 'sendmail' => 'Gửi mail', 'sendmail_path' => 'Đường dẫn gửi mail', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', diff --git a/lang/zh-cn/lang.php b/lang/zh-cn/lang.php index 7cfaee00..50c9e132 100644 --- a/lang/zh-cn/lang.php +++ b/lang/zh-cn/lang.php @@ -123,7 +123,6 @@ 'smtp_username' => '用户名', 'smtp_password' => '密码', 'smtp_port' => 'SMTP 端口', - 'smtp_ssl' => '需要SSL连接', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 路径', 'sendmail_path_comment' => '请确认 Sendmail 路径.', diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php index d45a60e3..e57666a3 100644 --- a/lang/zh-tw/lang.php +++ b/lang/zh-tw/lang.php @@ -116,7 +116,6 @@ 'smtp_username' => '使用者名', 'smtp_password' => '密碼', 'smtp_port' => 'SMTP 端口', - 'smtp_ssl' => '需要SSL連接', 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 路徑', 'sendmail_path_comment' => '請確認 Sendmail 路徑.', diff --git a/models/MailSetting.php b/models/MailSetting.php index ce8d0335..3ddb098c 100644 --- a/models/MailSetting.php +++ b/models/MailSetting.php @@ -58,9 +58,9 @@ public function initSettingsData() 'port' => $config->get('mail.port', 587), 'username' => $config->get('mail.username'), 'password' => $config->get('mail.password'), - 'encryption' => $config->get('mail.encryption'), ], ]); + $this->send_mode = $config->get('mail.default', static::MODE_MAIL); $this->sender_name = $config->get('mail.from.name', 'Your Site'); $this->sender_email = $config->get('mail.from.address', 'admin@example.com'); @@ -70,7 +70,6 @@ public function initSettingsData() $this->smtp_user = array_get($mailers['smtp'], 'username'); $this->smtp_password = array_get($mailers['smtp'], 'password'); $this->smtp_authorization = !!strlen($this->smtp_user); - $this->smtp_encryption = array_get($mailers['smtp'], 'encryption'); } public function getSendModeOptions() @@ -95,6 +94,7 @@ public static function applyConfigValues() case self::MODE_SMTP: $config->set('mail.mailers.smtp.host', $settings->smtp_address); $config->set('mail.mailers.smtp.port', $settings->smtp_port); + $config->set('mail.mailers.smtp.encryption', $settings->smtp_port === 465 ? 'tls' : null); if ($settings->smtp_authorization) { $config->set('mail.mailers.smtp.username', $settings->smtp_user); $config->set('mail.mailers.smtp.password', $settings->smtp_password); @@ -103,12 +103,6 @@ public static function applyConfigValues() $config->set('mail.mailers.smtp.username', null); $config->set('mail.mailers.smtp.password', null); } - if ($settings->smtp_encryption) { - $config->set('mail.mailers.smtp.encryption', $settings->smtp_encryption); - } - else { - $config->set('mail.mailers.smtp.encryption', null); - } break; case self::MODE_SENDMAIL: @@ -117,23 +111,10 @@ public static function applyConfigValues() } } - /** - * @return array smtp_encryption options values - */ - public function getSmtpEncryptionOptions() - { - return [ - '' => 'system::lang.mail.smtp_encryption_none', - 'tls' => 'system::lang.mail.smtp_encryption_tls', - 'ssl' => 'system::lang.mail.smtp_encryption_ssl', - ]; - } - /** * Filter fields callback. * - * We use this to automatically set the SMTP port to the encryption type's corresponding port, if it was originally - * using a default port. + * We use this to show smtp credential fields only for smtp mode and when smtp authorization is required. * * @param array $fields * @param string|null $context @@ -141,22 +122,8 @@ public function getSmtpEncryptionOptions() */ public function filterFields($fields, $context = null) { - if (in_array($fields->smtp_port->value ?? 25, [25, 465, 587])) { - switch ($fields->smtp_encryption->value ?? '') { - case 'tls': - $fields->smtp_port->value = 587; - break; - case 'ssl': - $fields->smtp_port->value = 465; - break; - case '': - default: - $fields->smtp_port->value = 25; - break; - } - } - $hideAuth = $fields->send_mode->value !== 'smtp' || !$fields->smtp_authorization->value; + if (isset($fields->smtp_user)) { $fields->smtp_user->hidden = $hideAuth; } diff --git a/models/mailsetting/fields.yaml b/models/mailsetting/fields.yaml index 3d70534e..2c185723 100644 --- a/models/mailsetting/fields.yaml +++ b/models/mailsetting/fields.yaml @@ -28,6 +28,7 @@ tabs: smtp_address: label: system::lang.mail.smtp_address tab: system::lang.mail.general + span: left trigger: action: show field: send_mode @@ -35,17 +36,7 @@ tabs: smtp_port: label: system::lang.mail.smtp_port - tab: system::lang.mail.general - span: auto - dependsOn: smtp_encryption - trigger: - action: show - field: send_mode - condition: value[smtp] - - smtp_encryption: - type: dropdown - label: system::lang.mail.smtp_encryption + type: number tab: system::lang.mail.general span: auto trigger: