Improve email testing logic and reliability

Author: srenon

Block/Adminhtml/System/Config/Form/Composer/Version.php

@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config;

Block/Adminhtml/System/Config/Form/Module/Version.php

@@ -43,7 +43,7 @@ class ValidateConfig extends Template
     /**
      * @var string
      */
-    protected $storeId;
+    protected $storeId = null;
 
     /**
      * @var string
@@ -165,18 +165,36 @@ public function loadDefaultConfig()
         $request = $this->getRequest();
         $formPostArray = (array) $request->getPost();
 
+        if ($request->getParam('website', false)) {
+            $scopeCode = $request->getParam('website');
+            $scopeType = ScopeInterface::SCOPE_WEBSITE;
+        } else if ($request->getParam('store', false)) {
+            $scopeCode = $request->getParam('store');
+            $scopeType = ScopeInterface::SCOPE_STORE;
+        } else {
+            $scopeCode = null;
+            $scopeType = ScopeInterface::SCOPE_STORE;
+        }
+
         $fields = array_keys($this->configFields);
         foreach ($fields as $field) {
             if (!array_key_exists($field, $formPostArray)) {
-                $this->setConfig($field, $this->_dataHelper->getConfigValue($field), $this->getStoreId());
+                $this->setConfig($field, $this->_dataHelper->getConfigValue($field, $scopeType, $scopeCode));
             } else {
                 $this->setConfig($field, $request->getPost($field));
             }
         }
 
+        $this->loadObscuredData($scopeType, $scopeCode);
+
+        return $this;
+    }
+
+    public function loadObscuredData($scopeType, $scopeCode)
+    {
         //if password mask (6 stars)
         if ($this->getConfig('password') === '******') {
-            $password = $this->_dataHelper->getConfigPassword($this->getStoreId());
+            $password = $this->_dataHelper->getConfigPassword($scopeType, $scopeCode);
             $this->setConfig('password', $password);
         }
 
@@ -189,13 +207,12 @@ public function loadDefaultConfig()
     protected function init()
     {
         $request = $this->getRequest();
-        $this->setStoreId($request->getParam('store', null));
 
         $this->loadDefaultConfig();
 
         $this->toAddress = $this->getConfig('email') ? $this->getConfig('email') : $this->getConfig('username');
 
-        $this->fromAddress = trim($this->getConfig('from_email'));
+        $this->fromAddress = trim((string) $this->getConfig('from_email'));
 
         if (!$this->emailAddressValidator->isValid($this->fromAddress)) {
             $this->fromAddress = $this->toAddress;
@@ -299,6 +316,9 @@ protected function validateServerEmailSetting()
         return $result;
     }
 
+    /**
+     * @return Smtp
+     */
     public function getMailTransportSmtp()
     {
         $username = $this->getConfig('username');

Block/Adminhtml/System/Config/ValidateConfigButton.php

@@ -2,7 +2,7 @@
 /**
  * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
- * http://www.magepal.com | support@magepal.com
+ * https://www.magepal.com | support@magepal.com
  */
 
 namespace MagePal\CustomSmtp\Controller\Adminhtml\Validateconfig;