From 932ca84bc0d39e5237a7273807e1c0f5435fddb9 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 21 Mar 2024 11:47:10 -0400
Subject: [PATCH] improve MailSettings filterFields

---
 modules/system/models/MailSetting.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index e4c74b163c..832a368192 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -141,7 +141,7 @@ public function getSmtpEncryptionOptions()
      */
     public function filterFields($fields, $context = null)
     {
-        if (in_array($fields->smtp_port->value ?? 25, [25, 465, 587])) {
+        if ($fields->smtp_port && $fields->smtp_encryption) {
             switch ($fields->smtp_encryption->value ?? '') {
                 case 'tls':
                     $fields->smtp_port->value = 587;
@@ -151,13 +151,8 @@ public function filterFields($fields, $context = null)
                     break;
                 case '':
                 default:
-                    $fields->smtp_port->value = 25;
-                    break;
+                    $fields->smtp_port->value = 587;
             }
         }
-        if (!$fields->smtp_authorization->value) {
-            $fields->smtp_user->hidden = true;
-            $fields->smtp_password->hidden = true;
-        }
     }
 }