From e0a505633600053eabdec6ab044f3a02f72d01f1 Mon Sep 17 00:00:00 2001 From: Robert Egginton Date: Wed, 24 Aug 2016 16:54:23 +0100 Subject: [PATCH 1/3] Add smtp port option --- Helper/Data.php | 14 ++++++++++++-- Model/Transport.php | 3 ++- etc/adminhtml/system.xml | 5 +++++ etc/config.xml | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Helper/Data.php b/Helper/Data.php index 0b1ed4a..85fad6d 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -47,7 +47,7 @@ public function getConfigUsername($store_id = null){ } /** - * Get system config password + * Get system config auth * * @param \Magento\Store\Model\ScopeInterface::SCOPE_STORE $store * @return string @@ -67,7 +67,7 @@ public function getConfigSsl($store_id = null){ } /** - * Get system config password + * Get system config host * * @param \Magento\Store\Model\ScopeInterface::SCOPE_STORE $store * @return string @@ -75,6 +75,16 @@ public function getConfigSsl($store_id = null){ public function getConfigSmtpHost($store_id = null){ return $this->scopeConfig->getValue('system/gmailsmtpapp/smtphost', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store_id); } + + /** + * Get system config port + * + * @param \Magento\Store\Model\ScopeInterface::SCOPE_STORE $store + * @return string + */ + public function getConfigSmtpPort($store_id = null){ + return $this->scopeConfig->getValue('system/gmailsmtpapp/smtpport', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store_id); + } /** * Get system config reply to diff --git a/Model/Transport.php b/Model/Transport.php index 3f5012d..4dba6ed 100644 --- a/Model/Transport.php +++ b/Model/Transport.php @@ -54,7 +54,8 @@ public function __construct(\Magento\Framework\Mail\MessageInterface $message, \ 'auth' => strtolower($dataHelper->getConfigAuth()), 'ssl' => $dataHelper->getConfigSsl(), 'username' => $dataHelper->getConfigUsername(), - 'password' => $dataHelper->getConfigPassword() + 'password' => $dataHelper->getConfigPassword(), + 'port' => $dataHelper->getConfigSmtpPort(), ]; diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 6f6aec7..7b505c8 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -24,6 +24,11 @@ Use "smtp.gmail.com" for Gmail or Google Apps. + + + validate-number + Use 465 or 587 if port 25 is throttled or blocked. + Email Address. diff --git a/etc/config.xml b/etc/config.xml index 94ea205..5331e6b 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -12,6 +12,7 @@ ssl LOGIN smtp.gmail.com + 587 1 1 From 6acdc878122247ebff8d1f1e551a8190f96e2a45 Mon Sep 17 00:00:00 2001 From: Renon Stewart Date: Wed, 7 Sep 2016 10:47:15 -0400 Subject: [PATCH 2/3] Issues #19 - Add smtp port option for testing --- Controller/Adminhtml/Test/Index.php | 3 ++- etc/adminhtml/system.xml | 3 ++- etc/config.xml | 2 +- view/adminhtml/templates/system/config/testbutton.phtml | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Controller/Adminhtml/Test/Index.php b/Controller/Adminhtml/Test/Index.php index e7667f3..7cc002b 100644 --- a/Controller/Adminhtml/Test/Index.php +++ b/Controller/Adminhtml/Test/Index.php @@ -70,7 +70,8 @@ public function execute() { 'auth' => strtolower($request->getPost('auth')), 'ssl' => $request->getPost('ssl'), 'username' => $username, - 'password' => $password + 'password' => $password, + 'port' => $request->getPost('smtpport') ); $transport = new \Zend_Mail_Transport_Smtp($smtpHost, $smtpConf); diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 7b505c8..003e666 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -27,7 +27,8 @@ validate-number - Use 465 or 587 if port 25 is throttled or blocked. + validate-number + Use 465 (ssl) or 587 (tls) if port 25 is throttled or blocked. diff --git a/etc/config.xml b/etc/config.xml index 5331e6b..ac8beb2 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -12,7 +12,7 @@ ssl LOGIN smtp.gmail.com - 587 + 465 1 1 diff --git a/view/adminhtml/templates/system/config/testbutton.phtml b/view/adminhtml/templates/system/config/testbutton.phtml index 36eec49..d3db451 100644 --- a/view/adminhtml/templates/system/config/testbutton.phtml +++ b/view/adminhtml/templates/system/config/testbutton.phtml @@ -29,6 +29,7 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); auth: $('#system_gmailsmtpapp_auth').val(), ssl:$('#system_gmailsmtpapp_ssl').val(), smtphost:$('#system_gmailsmtpapp_smtphost').val(), + smtpport:$('#system_gmailsmtpapp_smtpport').val(), username:$('#system_gmailsmtpapp_username').val(), password:$('#system_gmailsmtpapp_password').val(), email:$('#system_gmailsmtpapp_debug_email').val(), From 781ba866b6b7e1479ab0669fbee3a7e434d002e2 Mon Sep 17 00:00:00 2001 From: Renon Stewart Date: Wed, 7 Sep 2016 10:47:15 -0400 Subject: [PATCH 3/3] Issues #19 - Add smtp port option for testing --- Controller/Adminhtml/Test/Index.php | 3 ++- composer.json | 2 +- etc/adminhtml/system.xml | 3 ++- etc/config.xml | 2 +- etc/module.xml | 2 +- view/adminhtml/templates/system/config/testbutton.phtml | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Controller/Adminhtml/Test/Index.php b/Controller/Adminhtml/Test/Index.php index e7667f3..7cc002b 100644 --- a/Controller/Adminhtml/Test/Index.php +++ b/Controller/Adminhtml/Test/Index.php @@ -70,7 +70,8 @@ public function execute() { 'auth' => strtolower($request->getPost('auth')), 'ssl' => $request->getPost('ssl'), 'username' => $username, - 'password' => $password + 'password' => $password, + 'port' => $request->getPost('smtpport') ); $transport = new \Zend_Mail_Transport_Smtp($smtpHost, $smtpConf); diff --git a/composer.json b/composer.json index facaf9e..3a11be2 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "magento/framework": "100.0.*|100.1.*" }, "type": "magento2-module", - "version": "1.2.0", + "version": "1.3.0", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 7b505c8..003e666 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -27,7 +27,8 @@ validate-number - Use 465 or 587 if port 25 is throttled or blocked. + validate-number + Use 465 (ssl) or 587 (tls) if port 25 is throttled or blocked. diff --git a/etc/config.xml b/etc/config.xml index 5331e6b..ac8beb2 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -12,7 +12,7 @@ ssl LOGIN smtp.gmail.com - 587 + 465 1 1 diff --git a/etc/module.xml b/etc/module.xml index f766968..a4c20e5 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,6 +1,6 @@ - + diff --git a/view/adminhtml/templates/system/config/testbutton.phtml b/view/adminhtml/templates/system/config/testbutton.phtml index 36eec49..d3db451 100644 --- a/view/adminhtml/templates/system/config/testbutton.phtml +++ b/view/adminhtml/templates/system/config/testbutton.phtml @@ -29,6 +29,7 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); auth: $('#system_gmailsmtpapp_auth').val(), ssl:$('#system_gmailsmtpapp_ssl').val(), smtphost:$('#system_gmailsmtpapp_smtphost').val(), + smtpport:$('#system_gmailsmtpapp_smtpport').val(), username:$('#system_gmailsmtpapp_username').val(), password:$('#system_gmailsmtpapp_password').val(), email:$('#system_gmailsmtpapp_debug_email').val(),