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 @@ +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 @@ + + 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 @@ + + + text + 20 + 1 + 1 + 0 + + + + + magesmtppro.com]]> + password + adminhtml/system_config_backend_encrypted + 23 + 1 + 1 + 0 + + + text @@ -311,4 +332,4 @@ - \ No newline at end of file +