improve MailSettings filterFields

wintercms · Mar 21, 2024 · 932ca84 · 932ca84
1 parent 917675a
commit 932ca84
Showing 1 changed file with 2 additions and 7 deletions.
diff --git 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;
-        }
     }
 }