Code simplification.

e70feecc · Demian Katz · Robert Lange · 20065425 · e70feecc
Commit e70feecc authored 5 years ago by Demian Katz Committed by Robert Lange 2 years ago
--- a/module/VuFind/src/VuFind/Mailer/Factory.php
+++ b/module/VuFind/src/VuFind/Mailer/Factory.php
@@ -70,16 +70,14 @@ class Factory implements FactoryInterface
                'username' => $config->Mail->username,
                'password' => $config->Mail->password
            ];
+            // Set user defined secure connection if provided; otherwise set default
+            // secure connection based on configured port number.
            if (isset($config->Mail->secure)) {
-                // always set user defined secure connection
                $settings['connection_config']['ssl'] = $config->Mail->secure;
-            } else {
+            } elseif ($settings['port'] == '587') {
-                // set default secure connection based on configured port
+                $settings['connection_config']['ssl'] = 'tls';
-                if ($settings['port'] == '587') {
+            } elseif ($settings['port'] == '487') {
-                    $settings['connection_config']['ssl'] = 'tls';
+                $settings['connection_config']['ssl'] = 'ssl';
-                } elseif ($settings['port'] == '487') {
-                    $settings['connection_config']['ssl'] = 'ssl';
-                }
            }
        }
        return new Smtp(new SmtpOptions($settings));