From 5e1aab6ea562e6e9672e271c60b92d9f59b3a780 Mon Sep 17 00:00:00 2001
From: Hassan Williamson <haz@hazrpg.co.uk>
Date: Mon, 3 Apr 2017 13:02:18 +0100
Subject: [PATCH] Fixed issue whereby you could not select Google's alternative
 SSL port.

---
 .../local/Aschroder/SMTPPro/Helper/Data.php   | 13 ++++++++
 .../System/Config/Source/Smtp/Option.php      |  5 +--
 .../SMTPPro/Model/Transports/Google.php       |  2 +-
 .../SMTPPro/Model/Transports/GoogleSSL.php    | 31 +++++++++++++++++++
 .../local/Aschroder/SMTPPro/etc/config.xml    |  2 ++
 .../local/Aschroder/SMTPPro/etc/system.xml    | 23 +++++++++++++-
 6 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 app/code/local/Aschroder/SMTPPro/Model/Transports/GoogleSSL.php

diff --git a/app/code/local/Aschroder/SMTPPro/Helper/Data.php b/app/code/local/Aschroder/SMTPPro/Helper/Data.php
index 78d23df..c7b0d9b 100644
--- a/app/code/local/Aschroder/SMTPPro/Helper/Data.php
+++ b/app/code/local/Aschroder/SMTPPro/Helper/Data.php
@@ -52,6 +52,10 @@ public function isGoogleAppsEnabled($storeId = null)
     {
         return Mage::getStoreConfig('smtppro/general/option', $storeId) == "google";
     }
+    public function isGoogleAppsSSLEnabled($storeId = null)
+    {
+        return Mage::getStoreConfig('smtppro/general/option', $storeId) == "googlessl";
+    }
 
     public function isAmazonSESEnabled($storeId = null)
     {
@@ -111,6 +115,15 @@ public function getGoogleAppsPassword($storeId = null)
         return Mage::getStoreConfig('smtppro/general/googleapps_gpassword', $storeId);
     }
 
+    public function getGoogleAppsSSLEmail($storeId = null)
+    {
+        return Mage::getStoreConfig('smtppro/general/googleappsssl_email', $storeId);
+    }
+
+    public function getGoogleAppsSSLPassword($storeId = null)
+    {
+        return Mage::getStoreConfig('smtppro/general/googleappsssl_gpassword', $storeId);
+    }
 
     public function getSendGridEmail($storeId = null)
     {
diff --git a/app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php b/app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php
index ab7fde0..f635f51 100644
--- a/app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php
+++ b/app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php
@@ -12,7 +12,8 @@ public function toOptionArray()
     {
         $options = array(
         	"disabled"   => Mage::helper('smtppro')->__('Disabled'),
-            "google"   => Mage::helper('smtppro')->__('Google Apps or Gmail'),
+            "google"   => Mage::helper('smtppro')->__('Google Apps or Gmail (TLS)'),
+            "googlessl" => Mage::helper('smtppro')->__('Google Apps or Gmail (SSL)'),
             "smtp"   => Mage::helper('smtppro')->__('Custom SMTP'),
             "sendgrid"   => Mage::helper('smtppro')->__('SendGrid'),
             "mailup"   => Mage::helper('smtppro')->__('MailUp'),
@@ -20,4 +21,4 @@ public function toOptionArray()
         );
         return $options;
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/local/Aschroder/SMTPPro/Model/Transports/Google.php b/app/code/local/Aschroder/SMTPPro/Model/Transports/Google.php
index 61216f7..61e9705 100644
--- a/app/code/local/Aschroder/SMTPPro/Model/Transports/Google.php
+++ b/app/code/local/Aschroder/SMTPPro/Model/Transports/Google.php
@@ -8,7 +8,7 @@
 class Aschroder_SMTPPro_Model_Transports_Google extends Aschroder_SMTPPro_Model_Transports_Basesmtp {
 
     public function getName($storeId) {
-        return "Google Apps/Gmail";
+        return "Google Apps/Gmail (TLS)";
     }
     public function getEmail($storeId) {
         return Mage::helper('smtppro')->getGoogleAppsEmail($storeId);
diff --git a/app/code/local/Aschroder/SMTPPro/Model/Transports/GoogleSSL.php b/app/code/local/Aschroder/SMTPPro/Model/Transports/GoogleSSL.php
new file mode 100644
index 0000000..44d095f
--- /dev/null
+++ b/app/code/local/Aschroder/SMTPPro/Model/Transports/GoogleSSL.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @author Ashley Schroder (aschroder.com)
+ * @copyright  Copyright (c) 2014 Ashley Schroder
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+class Aschroder_SMTPPro_Model_Transports_GoogleSSL extends Aschroder_SMTPPro_Model_Transports_Basesmtp {
+
+    public function getName($storeId) {
+        return "Google Apps/Gmail (SSL)";
+    }
+    public function getEmail($storeId) {
+        return Mage::helper('smtppro')->getGoogleAppsSSLEmail($storeId);
+    }
+    public function getPassword($storeId) {
+        return Mage::helper('smtppro')->getGoogleAppsSSLPassword($storeId);
+    }
+    public function getHost($storeId) {
+        return "smtp.gmail.com";
+    }
+    public function getPort($storeId) {
+        return 465;
+    }
+    public function getAuth($storeId) {
+        return 'login';
+    }
+    public function getSsl($storeId) {
+        return 'ssl';
+    }
+}
diff --git a/app/code/local/Aschroder/SMTPPro/etc/config.xml b/app/code/local/Aschroder/SMTPPro/etc/config.xml
index 0b69fd9..e7e15bf 100644
--- a/app/code/local/Aschroder/SMTPPro/etc/config.xml
+++ b/app/code/local/Aschroder/SMTPPro/etc/config.xml
@@ -192,6 +192,8 @@
                 <option>disabled</option>
                 <googleapps_email></googleapps_email>
                 <googleapps_gpassword backend_model="adminhtml/system_config_backend_encrypted" />
+                <googleappsssl_email></googleappsssl_email>
+                <googleappsssl_gpassword backend_model="adminhtml/system_config_backend_encrypted" />
                 <sendgrid_email></sendgrid_email>
                 <sendgrid_password backend_model="adminhtml/system_config_backend_encrypted" />
                 <mailup_email></mailup_email>
diff --git a/app/code/local/Aschroder/SMTPPro/etc/system.xml b/app/code/local/Aschroder/SMTPPro/etc/system.xml
index d81e468..53f5b33 100644
--- a/app/code/local/Aschroder/SMTPPro/etc/system.xml
+++ b/app/code/local/Aschroder/SMTPPro/etc/system.xml
@@ -62,6 +62,27 @@
               <depends><option>google</option></depends>
             </googleapps_gpassword>
 
+            <googleappsssl_email translate="label">
+              <label>Google Apps Email Address</label>
+              <frontend_type>text</frontend_type>
+              <sort_order>20</sort_order>
+              <show_in_default>1</show_in_default>
+              <show_in_website>1</show_in_website>
+              <show_in_store>0</show_in_store>
+              <depends><option>google</option></depends>
+            </googleappsssl_email>
+            <googleappsssl_gpassword translate="label comment">
+              <label>Google Apps Password</label>
+              <comment><![CDATA[Input your Google Apps or Gmail username and password here. For configuration recommendations please see the guide at <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>]]></comment>
+              <frontend_type>password</frontend_type>
+              <backend_model>adminhtml/system_config_backend_encrypted</backend_model>
+              <sort_order>23</sort_order>
+              <show_in_default>1</show_in_default>
+              <show_in_website>1</show_in_website>
+              <show_in_store>0</show_in_store>
+              <depends><option>google</option></depends>
+            </googleappsssl_gpassword>
+
               <sendgrid_email translate="label">
                   <label>SendGrid Username</label>
                   <frontend_type>text</frontend_type>
@@ -311,4 +332,4 @@
       </groups>
     </smtppro>
   </sections>
-</config>
\ No newline at end of file
+</config>