ASchroder_SMTPPro - Version 2.0.1

Version Notes

See magesmtppro.com for full release notes

Release Info

Developer	ASchroder
Extension	ASchroder_SMTPPro
Version	2.0.1
Comparing to
See all releases

Code changes from version 2.0.0 to 2.0.1

Files changed (31) hide show

README +30 -0
app/code/local/Aschroder/SMTPPro/Block/Adminhtml/Table.php +1 -1
app/code/local/Aschroder/SMTPPro/Block/Adminhtml/Test.php +1 -1
app/code/local/Aschroder/SMTPPro/Block/Log.php +1 -1
app/code/local/Aschroder/SMTPPro/Block/Log/Grid.php +1 -1
app/code/local/Aschroder/SMTPPro/Block/Log/View.php +1 -29
app/code/local/Aschroder/SMTPPro/Helper/Mysql4/Install.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Email.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Email/Log.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Email/Template.php +2 -1
app/code/local/Aschroder/SMTPPro/Model/Mysql4/Email/Log.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Mysql4/Email/Log/Collection.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Mysql4/Setup.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/Observer.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Authentication.php +1 -1
app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Development.php +0 -19
app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php +2 -2
app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Ssl.php +2 -2
app/code/local/Aschroder/SMTPPro/Model/Transports/Basesmtp.php +15 -7
app/code/local/Aschroder/SMTPPro/Model/Transports/Ses.php +0 -4
app/code/local/Aschroder/SMTPPro/controllers/LogController.php +1 -1
app/code/local/Aschroder/SMTPPro/controllers/TestController.php +57 -55
app/code/local/Aschroder/SMTPPro/etc/config.xml +4 -3
app/code/local/Aschroder/SMTPPro/etc/system.xml +19 -21
app/code/local/Aschroder/SMTPPro/sql/smtppro_setup/mysql4-install-1.1.0.php +1 -1
app/code/local/Aschroder/SMTPPro/sql/smtppro_setup/mysql4-upgrade-1.4.3-1.4.4.php +2 -3
app/design/adminhtml/{default → base}/default/template/smtppro/view.phtml +1 -1
app/locale/en_US/Aschroder_SMTPPro.csv +79 -0
composer.json +13 -0
modman +9 -0
package.xml +1 -19

README ADDED Viewed

	@@ -0,0 +1,30 @@


1	+ Magento SMTP Pro Extension
2	+ by Ashley Schroder (aschroder.com)
3	+
4	+ - Free and Opensource email extension for Magento
5	+ - Easily send Magento transactional emails via Google Apps, Gmail, Amazon SES or your own SMTP server.
6	+ - Test your conifguration from the Magento admin
7	+ - View a log of all emails
8	+ - Improve deliverability with an external SMTP server
9	+
10	+ FAQ
11	+
12	+ Q: It's not working
13	+ A: Check for extension conflicts, and check that your host allows outbound SMTP traffic
14	+
15	+ Q: Does it work with the Mailchimp extension
16	+ A: yes, see: http://www.aschroder.com/2011/09/using-smtp-pro-and-ebizmarts-mailchimp-extension-in-magento/
17	+
18	+ Q: How do I install it manually
19	+ A: See: http://www.aschroder.com/2010/05/installing-a-magento-extension-manually-via-ftp-or-ssh/ or use modman.
20	+
21	+ Q: Self test is failing with "Exception message was: Unable to connect via TLS"
22	+ A: Check that you have OpenSSL installed for your PHP environment.
23	+
24	+ Q: Self test is failing with messages like: "can not open connection to the host, on port 587" or "Connection timed out".
25	+ A: Check that you have the SMTP server host and port correct, if you do - then check with your webhost, many block SMTP connections due to spam. If that's the case, there are plenty of expert Magento hosts on display at magespeedtest.com.
26	+
27	+ Q: Self test is failing with "Exception message was: 5.7.1 Username and Password not accepted. Learn more at 5.7.1..."
28	+ A: It's actually good advice to learn more here: http://support.google.com/mail/bin/answer.py?answer=14257. But two things to check:
29	+ 1) that you are really 110% sure you have the right username and password (test it on gmail.com)
30	+ 2) If that does work, then Google may have blocked your server IP due to too many wrong passwords. You need to log in to gmail.com _from_ that IP - in order to answer the captcha and allow the IP through again. There's a few ways to do that - SOCKS proxy, X forward a browser, use Lynx.

app/code/local/Aschroder/SMTPPro/Block/Adminhtml/Table.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	* This is the Email Service Table
5	*
6	* @author Ashley Schroder (aschroder.com)
7	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10


4	* This is the Email Service Table
5	*
6	* @author Ashley Schroder (aschroder.com)
7	+ * @copyright Copyright (c) 2014 Ashley Schroder
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10

app/code/local/Aschroder/SMTPPro/Block/Adminhtml/Test.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	* This is the Self test Button
5	*
6	* @author Ashley Schroder (aschroder.com)
7	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10


4	* This is the Self test Button
5	*
6	* @author Ashley Schroder (aschroder.com)
7	+ * @copyright Copyright (c) 2014 Ashley Schroder
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10

app/code/local/Aschroder/SMTPPro/Block/Log.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?php
2	/**
3	* @author Ashley Schroder (aschroder.com)
4	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
5	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
6	*/
7


1	<?php
2	/**
3	* @author Ashley Schroder (aschroder.com)
4	+ * @copyright Copyright (c) 2014 Ashley Schroder
5	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
6	*/
7

app/code/local/Aschroder/SMTPPro/Block/Log/Grid.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2
3	/**
4	* @author Ashley Schroder (aschroder.com)
5	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
6	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7	*/
8


2
3	/**
4	* @author Ashley Schroder (aschroder.com)
5	+ * @copyright Copyright (c) 2014 Ashley Schroder
6	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7	*/
8

app/code/local/Aschroder/SMTPPro/Block/Log/View.php CHANGED Viewed

@@ -1,7 +1,7 @@
             <?php
             /**
              * @author Ashley Schroder (aschroder.com)
-            -
             * @copyright  Copyright (c) 2010 Ashley Schroder
              * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
              */
@@ -26,32 +26,4 @@ class Aschroder_SMTPPro_Block_Log_View extends Mage_Catalog_Block_Product_Abstra
                 public function getBackUrl() {
                     return Mage::helper('adminhtml')->getUrl('*/log');
+                }
-            -
-            -
                // This is an experiment in progress - if you're
-            -
                // reading this code, maybe you'd be interested...
-            -
-            -
                // The idea being that during development we can include
-            -
                // templates from the actual extension code, rather than rely on them
-            -
                // coming from ... not entriely convinced it's a good thing...
-            -
-            -
                public function fetchView($fileName) {
-            -
-            -
                	// This is so we do not need to keep templates
-            -
                	// outside of the extension code.
-            -
                	$class_parts = explode("_", __CLASS__);
-            -
                	$dev_template_path = Mage::getModuleDir('', $class_parts[0]."_".$class_parts[1]).DS."templates";
-            -
-            -
                	if(Mage::getIsDeveloperMode() &&
-            -
                		file_exists($dev_template_path.DS.$fileName)) {
-            -
-            -
                		Mage::log("NOTE: Loading template from development path - not the design directory");
-            -
            	    	$this->setScriptPath($dev_template_path);
-            -
-            -
                	} else {
-            -
                		$this->setScriptPath(Mage::getBaseDir('design'));
-            -
                	}
-            -
-            -
                	return parent::fetchView($fileName);
-            -
                }
-            -
+            }

             <?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)
              */
                 public function getBackUrl() {
                     return Mage::helper('adminhtml')->getUrl('*/log');
+                }
+            }

app/code/local/Aschroder/SMTPPro/Helper/Mysql4/Install.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	*
6	*
7	* @author Jay El-Kaake
8	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11


5	*
6	*
7	* @author Jay El-Kaake
8	+ * @copyright Copyright (c) 2014 Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11

app/code/local/Aschroder/SMTPPro/Model/Email.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	* configuration.
6	*
7	* @author Ashley Schroder (aschroder.com)
8	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11


5	* configuration.
6	*
7	* @author Ashley Schroder (aschroder.com)
8	+ * @copyright Copyright (c) 2014 Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11

app/code/local/Aschroder/SMTPPro/Model/Email/Log.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/Model/Email/Template.php CHANGED Viewed

	@@ -6,7 +6,8 @@
6	* configuration.
7	*
8	* @author Ashley Schroder (aschroder.com)
9	- * @copyright Copyright (c) 2014 ~~ASchroder~~ ~~Consulting Ltd~~

10	*/
11
12	class Aschroder_SMTPPro_Model_Email_Template extends Mage_Core_Model_Email_Template


6	* configuration.
7	*
8	* @author Ashley Schroder (aschroder.com)
9	+ * @copyright Copyright (c) 2014 Ashley Schroder
10	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
11	*/
12
13	class Aschroder_SMTPPro_Model_Email_Template extends Mage_Core_Model_Email_Template

app/code/local/Aschroder/SMTPPro/Model/Mysql4/Email/Log.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/Model/Mysql4/Email/Log/Collection.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/Model/Mysql4/Setup.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/Model/Observer.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	* Observer that logs emails after they have been sent
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	* Observer that logs emails after they have been sent
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Authentication.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @copyright Copyright (c) ~~2009~~ Ashley Schroder
4	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
5	* @author Ashley Schroder
6	*/


1	<?php
2	/**
3	+ * @copyright Copyright (c) 2014 Ashley Schroder
4	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
5	* @author Ashley Schroder
6	*/

app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Development.php DELETED Viewed

@@ -1,19 +0,0 @@
-            -
            <?php
-            -
            /**
-            -
             * @copyright  Copyright (c) 2009 Ashley Schroder
-            -
             * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-            -
             * @author     Ashley Schroder
-            -
             */
-            -
-            -
            class Aschroder_SMTPPro_Model_System_Config_Source_Smtp_Development
-            -
            {
-            -
-            -
            	    public function toOptionArray()
-            -
                {
-            -
                    return array(
-            -
                    	"disabled"   => Mage::helper('adminhtml')->__('Development Mode disabled'),
-            -
                        "contact"   => Mage::helper('adminhtml')->__('Redirect to contact form email'),
-            -
                        "supress"   => Mage::helper('adminhtml')->__('Supress all emails')
-            -
                    );
-            -
                }
-            -
            }

app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Option.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	/**
3	- * @~~copyright Copyright~~ ~~(c) 2009~~ Ashley Schroder

4	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
5	- * @author Ashley Schroder
6	*/
7
8	class Aschroder_SMTPPro_Model_System_Config_Source_Smtp_Option extends Varien_Object


1	<?php
2	/**
3	+ * @author Ashley Schroder (aschroder.com)
4	+ * @copyright Copyright (c) 2014 Ashley Schroder
5	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)

6	*/
7
8	class Aschroder_SMTPPro_Model_System_Config_Source_Smtp_Option extends Varien_Object

app/code/local/Aschroder/SMTPPro/Model/System/Config/Source/Smtp/Ssl.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	<?php
2	/**
3	- * @~~copyright Copyright~~ ~~(c) 2009~~ Ashley Schroder

4	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
5	- * @author Ashley Schroder
6	*/
7
8	class Aschroder_SMTPPro_Model_System_Config_Source_Smtp_Ssl


1	<?php
2	/**
3	+ * @author Ashley Schroder (aschroder.com)
4	+ * @copyright Copyright (c) 2014 Ashley Schroder
5	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)

6	*/
7
8	class Aschroder_SMTPPro_Model_System_Config_Source_Smtp_Ssl

app/code/local/Aschroder/SMTPPro/Model/Transports/Basesmtp.php CHANGED Viewed

@@ -25,13 +25,21 @@ class Aschroder_SMTPPro_Model_Transports_Basesmtp {
                     $_helper->log("Using $name Transport.");
-            -
                    $config = array(
-            -
                        'ssl' => $ssl,
-            -
                        'port' => $port,
-            -
                        'auth' => $auth,
-            -
                        'username' => $email,
-            -
                        'password' => $password
-            -
                    );
                     $emailTransport = new Zend_Mail_Transport_Smtp($host, $config);
                     return $emailTransport;


25
26	$_helper->log("Using $name Transport.");
27
28	+ $config = array();
29	+
30	+ if ($auth != "none") {
31	+ $config['auth'] = $auth;
32	+ $config['username'] = $name;
33	+ $config['password'] = $password;
34	+ }
35	+
36	+ if ($port) {
37	+ $config['port'] = $port;
38	+ }
39	+
40	+ if ($ssl != "none" ) {
41	+ $config['ssl'] = $ssl;
42	+ }
43
44	$emailTransport = new Zend_Mail_Transport_Smtp($host, $config);
45	return $emailTransport;

app/code/local/Aschroder/SMTPPro/Model/Transports/Ses.php CHANGED Viewed

	@@ -29,10 +29,6 @@ class Aschroder_SMTPPro_Model_Transports_Ses {
29	)
30	);
31
32	- $_helper->log("access is: " . print_r($_helper->getAmazonSESAccessKey($storeId), true));
33	- $_helper->log("pk is: " . print_r($_helper->getAmazonSESPrivateKey($storeId), true));
34	- $_helper->log("Transport is: " . print_r($emailTransport, true));
35	-
36	return $emailTransport;
37	}
38	}


29	)
30	);
31




32	return $emailTransport;
33	}
34	}

app/code/local/Aschroder/SMTPPro/controllers/LogController.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5	*
6	*
7	* @author Ashley Schroder (aschroder.com)
8	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11


5	*
6	*
7	* @author Ashley Schroder (aschroder.com)
8	+ * @copyright Copyright (c) 2014 Ashley Schroder
9	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
10	*/
11

app/code/local/Aschroder/SMTPPro/controllers/TestController.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	* Test the Email sending and configuration integrity
5	*
6	* @author Ashley Schroder (aschroder.com)
7	- * @copyright Copyright (c) 2014 ~~ASchroder~~ ~~Consulting Ltd~~
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10	class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
	@@ -27,44 +27,45 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
27
28	protected $KNOWN_ERRORS = array(
29	"/Email address is not verified/" => "Either your sending or receiving email address is not verified.<br/>Please check your Amazon SES console and confirm the email addresses are verified and the region matches.",
30	- "/RequestExpired/" => "Check the date and time on your server is set correctly.<br/>Amazon's servers think your server time is more than 5 minutes different to their time and are rejecting the request."

31	);
32
33	public function indexAction()
34	{
35	$_helper = Mage::helper('smtppro');
36
37	- $_helper->log("Running ~~SMTPPro~~ Self Test");
38
39	$success = true;
40	$websiteModel = Mage::app()->getWebsite($this->getRequest()->getParam('website'));
41	$this->TEST_EMAIL = Mage::getStoreConfig('trans_email/ident_general/email', $websiteModel->getId());
42
43	- $msg = "~~SMTPPro~~ Self Test Results";
44
45	if (!$_helper->isEnabled()) {
46	- $msg = $msg . "<br/> Extension disabled, cannot run test.";
47	- $_helper->log("~~skipped~~, ~~disabled~~.");
48	Mage::getSingleton('adminhtml/session')->addError($msg);
49	$this->_redirectReferer();
50	return;
51	}
52
53	// check the re-writes have not clashed
54	- $_helper->log("Checking config re-writes have not clashed.");
55
56	$email_rewrite = "".Mage::getConfig()->getNode('global/models/core/rewrite/email');
57	$email_template_rewrite = "".Mage::getConfig()->getNode('global/models/core/rewrite/email_template');
58
59	if ($this->checkRewrite($this->EXPECTED_REWRITE_CLASSES["email_rewrite"], $email_rewrite)) {
60	$success = false;
61	- $msg = $msg . "<br/> Detected overwrite conflict: $email_rewrite";
62	- $_helper->log("Detected overwrite conflict: $email_rewrite");
63	}
64	if ($this->checkRewrite($this->EXPECTED_REWRITE_CLASSES["email_template_rewrite"], $email_template_rewrite)) {
65	$success = false;
66	- $msg = $msg . "<br/> Detected overwrite conflict: $email_template_rewrite";
67	- $_helper->log("Detected overwrite conflict: $email_template_rewrite");
68	}
69
70	// Hosts often block SMTP outbound connections, so we check for that here
	@@ -72,7 +73,7 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
72	$transport = $_helper->getTransport($websiteModel->getId());
73
74	if (is_subclass_of($transport, 'Aschroder_SMTPPro_Model_Transports_Basesmtp')) {
75	- $_helper->log("Raw connection test for SMTP options.");
76	$fp = false;
77
78	try {
	@@ -81,26 +82,26 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
81	// An error will be reported below.
82	}
83
84	- Mage::helper('smtppro')->log("Complete");
85
86	if (!$fp) {
87	$success = false;
88	- $_helper->log("Failed to connect to SMTP server. Reason: " . $errstr . "(" . $errno . ")");
89	- $msg = $msg . "<br/>Failed to connect to SMTP server. Reason: " . $errstr . "(" . $errno . ")";
90	- $msg = $msg . "<br/> This extension requires an outbound SMTP connection on port: " . $transport->getPort();
91	} else {
92	- $_helper->log("Connection to Host SMTP server successful");
93	- $msg = $msg . "<br/> Connection to Host SMTP server successful.";
94	fclose($fp);
95	}
96	} else {
97	- $_helper->log("Skipping raw connection test for non-SMTP options.");
98	}
99
100	$to = Mage::getStoreConfig('contacts/email/recipient_email', $websiteModel->getId());
101
102	$mail = new Zend_Mail();
103	- $sub = "Test Email From ~~SMTPPro~~ Magento Extension";
104	$body =
105	"Hi,\n\n" .
106	"This is a Test Email from your Magento Store. If you are seeing this email then your " .
	@@ -114,8 +115,8 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
114	->setSubject($sub)
115	->setBodyText($body);
116
117	- $_helper->log("Actual email sending test~~....~~");
118	- $msg = $msg . "<br/> Sending test email to your contact form address: " . $to . " from: " . $this->TEST_EMAIL;
119
120	try {
121
	@@ -138,29 +139,30 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
138	'html' => false,
139	'email_body' => $body));
140
141	- $msg = $msg . "<br/> Test email was sent successfully.";
142	- $_helper->log("Test email was sent successfully");
143
144	} else {
145	$success = false;
146	- $_helper->log("Failed to find transport for test~~....~~");
147	- $msg = $msg . "<br/> Failed to find transport for test. ";
148	}
149
150	} catch (Exception $e) {
151	$success = false;
152	- $msg = $msg . "~~<br/>~~ Unable to send test email.";
153	if ($help = $this->knowError($e->getMessage())) {
154	- $msg = $msg . "<br/> " . $help;
155	} else {
156	- $msg = $msg . "<br/> Exception message was: " . $e->getMessage() ~~. "..."~~;
157	- $msg = $msg . "<br/> Please check the user guide for frequent error messages and their solutions.";
158	}
159	- $_helper->log("Test email was not sent successfully: " . $e->getMessage() ~~. "\n See exception log for more details."~~);

160	Mage::logException($e);
161	}
162
163	- $_helper->log("Checking that a template exists for the default locale and that email communications are enabled~~....~~");
164
165	try {
166
	@@ -178,26 +180,26 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
178	$mailTemplate->setSenderEmail("test@email.com");
179
180	if ($mailTemplate->isValidForSend()) {
181	- $msg = $msg . "<br/> Default templates exist.";
182	- $msg = $msg . "<br/> Email communications are enabled.";
183	- $_helper->log("Default templates exist and email communications are enabled.");
184	} else {
185	$success = false;
186	- $msg = $msg . "<br/> Could not find default template, or template not valid, or email communications disabled in Advanced > System settings.";
187	- $msg = $msg . "<br/> Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails. Also check Advanced > System settings to ensure email communications are enabled.";
188	- $_helper->log("Could not find default template, or template not valid, or email communications disabled in Advanced > System settings");
189	}
190
191	} catch (Exception $e) {
192
193	$success = false;
194	- $msg = $msg . "<br/> Could not test default template validity.";
195	- $msg = $msg . "<br/> Exception message was: " . $e->getMessage() . "...";
196	- $msg = $msg . "<br/> Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails.";
197	- $_helper->log("Could not test default template validity: " . $e->getMessage());
198	}
199
200	- $_helper->log("Checking that tables are created~~....~~");
201
202	try {
203
	@@ -206,31 +208,31 @@ class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action
206
207	if (!$logExists) {
208	$success = false;
209	- $msg = $msg . "<br/> Could not find required database tables.";
210	- $msg = $msg . "<br/> Please try to manually re-run the table creation script. For assistance please contact us.";
211	- $_helper->log("Could not find required tables.");
212	} else {
213	- $msg = $msg . "<br/> Required database tables exist.";
214	- $_helper->log("Required database tables exist.");
215	}
216
217	} catch (Exception $e) {
218
219	$success = false;
220	- $msg = $msg . "<br/> Could not find required database tables.";
221	- $msg = $msg . "<br/> Exception message was: " . $e->getMessage() ~~. "..."~~;
222	- $msg = $msg . "<br/> Please try to manually re-run the table creation script. For assistance please contact us.";
223	- $_helper->log("Could not find required tables: " . $e->getMessage());
224	}
225
226
227	- $_helper->log("Complete");
228
229	if ($success) {
230	- $msg = $msg . "<br/> Testing complete, if you are still experiencing difficulties please visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.";
231	Mage::getSingleton('adminhtml/session')->addSuccess($msg);
232	} else {
233	- $msg = $msg . "<br/> Testing failed, please review the reported problems and if you need further help visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.";
234	Mage::getSingleton('adminhtml/session')->addError($msg);
235	}
236


4	* Test the Email sending and configuration integrity
5	*
6	* @author Ashley Schroder (aschroder.com)
7	+ * @copyright Copyright (c) 2014 Ashley Schroder
8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10	class Aschroder_SMTPPro_TestController extends Mage_Adminhtml_Controller_Action

27
28	protected $KNOWN_ERRORS = array(
29	"/Email address is not verified/" => "Either your sending or receiving email address is not verified.<br/>Please check your Amazon SES console and confirm the email addresses are verified and the region matches.",
30	+ "/RequestExpired/" => "Check the date and time on your server is set correctly.<br/>Amazon's servers think your server time is more than 5 minutes different to their time and are rejecting the request.",
31	+ "/Request is missing Authentication Token/" => "Check that you have an access key and secret key."
32	);
33
34	public function indexAction()
35	{
36	$_helper = Mage::helper('smtppro');
37
38	+ $_helper->log($_helper->__("Running SMTP Pro Self Test"));
39
40	$success = true;
41	$websiteModel = Mage::app()->getWebsite($this->getRequest()->getParam('website'));
42	$this->TEST_EMAIL = Mage::getStoreConfig('trans_email/ident_general/email', $websiteModel->getId());
43
44	+ $msg = $_helper->__("SMTP Pro Self Test Results");
45
46	if (!$_helper->isEnabled()) {
47	+ $msg = $msg . "<br/>". $_helper->__("Extension disabled, cannot run test.");
48	+ $_helper->log($_helper->__("Extension disabled, cannot run test."));
49	Mage::getSingleton('adminhtml/session')->addError($msg);
50	$this->_redirectReferer();
51	return;
52	}
53
54	// check the re-writes have not clashed
55	+ $_helper->log($_helper->__("Checking config re-writes have not clashed."));
56
57	$email_rewrite = "".Mage::getConfig()->getNode('global/models/core/rewrite/email');
58	$email_template_rewrite = "".Mage::getConfig()->getNode('global/models/core/rewrite/email_template');
59
60	if ($this->checkRewrite($this->EXPECTED_REWRITE_CLASSES["email_rewrite"], $email_rewrite)) {
61	$success = false;
62	+ $msg = $msg . "<br/>". $_helper->__("Detected overwrite conflict: %s" , $email_rewrite);
63	+ $_helper->log($_helper->__("Detected overwrite conflict: %s" , $email_rewrite));
64	}
65	if ($this->checkRewrite($this->EXPECTED_REWRITE_CLASSES["email_template_rewrite"], $email_template_rewrite)) {
66	$success = false;
67	+ $msg = $msg . "<br/>". $_helper->__("<Detected overwrite conflict: %s", $email_template_rewrite);
68	+ $_helper->log($_helper->__("Detected overwrite conflict: %s", $email_template_rewrite));
69	}
70
71	// Hosts often block SMTP outbound connections, so we check for that here

73	$transport = $_helper->getTransport($websiteModel->getId());
74
75	if (is_subclass_of($transport, 'Aschroder_SMTPPro_Model_Transports_Basesmtp')) {
76	+ $_helper->log($_helper->__("Raw connection test for SMTP options."));
77	$fp = false;
78
79	try {

82	// An error will be reported below.
83	}
84
85	+ Mage::helper('smtppro')->log($_helper->__("Complete"));
86
87	if (!$fp) {
88	$success = false;
89	+ $_helper->log($_helper->__("Failed to connect to SMTP server. Reason: ") . $errstr . "(" . $errno . ")");
90	+ $msg = $msg . "<br/>". $_helper->__("Failed to connect to SMTP server. Reason: ") . $errstr . "(" . $errno . ")";
91	+ $msg = $msg . "<br/>". $_helper->__("This extension requires an outbound SMTP connection on port: ") . $transport->getPort();
92	} else {
93	+ $_helper->log($_helper->__("Connection to Host SMTP server successful"));
94	+ $msg = $msg . "<br/>". $_helper->__("Connection to Host SMTP server successful.");
95	fclose($fp);
96	}
97	} else {
98	+ $_helper->log($_helper->__("Skipping raw connection test for non-SMTP options."));
99	}
100
101	$to = Mage::getStoreConfig('contacts/email/recipient_email', $websiteModel->getId());
102
103	$mail = new Zend_Mail();
104	+ $sub = $_helper->__("Test Email From SMTP Pro Magento Extension");
105	$body =
106	"Hi,\n\n" .
107	"This is a Test Email from your Magento Store. If you are seeing this email then your " .

115	->setSubject($sub)
116	->setBodyText($body);
117
118	+ $_helper->log($_helper->__("Actual email sending test..."));
119	+ $msg = $msg . "<br/>". $_helper->__("Sending test email to your contact form address: ") . $to . $_helper->__(" from: ") . $this->TEST_EMAIL;
120
121	try {
122

139	'html' => false,
140	'email_body' => $body));
141
142	+ $msg = $msg . "<br/>". $_helper->__("Test email was sent successfully.");
143	+ $_helper->log($_helper->__("Test email was sent successfully"));
144
145	} else {
146	$success = false;
147	+ $_helper->log($_helper->__("Failed to find transport for test."));
148	+ $msg = $msg . "<br/>". $_helper->__("Failed to find transport for test.");
149	}
150
151	} catch (Exception $e) {
152	$success = false;
153	+ $msg = $msg . $_helper->__("Unable to send test email.");
154	if ($help = $this->knowError($e->getMessage())) {
155	+ $msg = $msg . "<br/>" . $help;
156	} else {
157	+ $msg = $msg . "<br/>". $_helper->__("Exception message was: %s", $e->getMessage());
158	+ $msg = $msg . "<br/>". $_helper->__("Please check the user guide for frequent error messages and their solutions.");
159	}
160	+ $_helper->log($_helper->__("Test email was not sent successfully: %s", $e->getMessage()));
161	+ $_helper->log($_helper->__("See exception log for more details."));
162	Mage::logException($e);
163	}
164
165	+ $_helper->log($_helper->__("Checking that a template exists for the default locale and that email communications are enabled..."));
166
167	try {
168

180	$mailTemplate->setSenderEmail("test@email.com");
181
182	if ($mailTemplate->isValidForSend()) {
183	+ $msg = $msg . "<br/>". $_helper->__("Default templates exist.");
184	+ $msg = $msg . "<br/>". $_helper->__("Email communications are enabled.");
185	+ $_helper->log($_helper->__("Default templates exist and email communications are enabled."));
186	} else {
187	$success = false;
188	+ $msg = $msg . "<br/>". $_helper->__("Could not find default template, or template not valid, or email communications disabled in Advanced > System settings.");
189	+ $msg = $msg . "<br/>". $_helper->__("Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails. Also check Advanced > System settings to ensure email communications are enabled.");
190	+ $_helper->log($_helper->__("Could not find default template, or template not valid, or email communications disabled in Advanced > System settings"));
191	}
192
193	} catch (Exception $e) {
194
195	$success = false;
196	+ $msg = $msg . "<br/>". $_helper->__("Could not test default template validity.");
197	+ $msg = $msg . "<br/>". $_helper->__("Exception message was: %s", $e->getMessage() . "...");
198	+ $msg = $msg . "<br/>". $_helper->__("Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails.");
199	+ $_helper->log($_helper->__("Could not test default template validity: %s", $e->getMessage()));
200	}
201
202	+ $_helper->log($_helper->__("Checking that tables are created..."));
203
204	try {
205

208
209	if (!$logExists) {
210	$success = false;
211	+ $msg = $msg . "<br/>". $_helper->__("Could not find required database tables.");
212	+ $msg = $msg . "<br/>". $_helper->__("Please try to manually re-run the table creation script. For assistance please contact us.");
213	+ $_helper->log($_helper->__("Could not find required tables."));
214	} else {
215	+ $msg = $msg . "<br/>". $_helper->__("Required database tables exist.");
216	+ $_helper->log($_helper->__("Required database tables exist."));
217	}
218
219	} catch (Exception $e) {
220
221	$success = false;
222	+ $msg = $msg . "<br/>". $_helper->__("Could not find required database tables.");
223	+ $msg = $msg . "<br/>". $_helper->__("Exception message was: %s", $e->getMessage());
224	+ $msg = $msg . "<br/>". $_helper->__("Please try to manually re-run the table creation script. For assistance please contact us.");
225	+ $_helper->log($_helper->__("Could not find required tables: %s", $e->getMessage()));
226	}
227
228
229	+ $_helper->log($_helper->__("Complete"));
230
231	if ($success) {
232	+ $msg = $msg . "<br/>". $_helper->__("Testing complete, if you are still experiencing difficulties please visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.");
233	Mage::getSingleton('adminhtml/session')->addSuccess($msg);
234	} else {
235	+ $msg = $msg . "<br/>". $_helper->__("Testing failed, please review the reported problems and if you need further help visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.");
236	Mage::getSingleton('adminhtml/session')->addError($msg);
237	}
238

app/code/local/Aschroder/SMTPPro/etc/config.xml CHANGED Viewed

	@@ -3,14 +3,15 @@
3	/**
4	* SMTP Pro integration.
5	*
6	- * @~~package Aschroder_SMTPPro~~
7	- * @~~author~~ Ashley Schroder ~~(aschroder.com)~~

8	*/
9	-->
10	<config>
11	<modules>
12	<Aschroder_SMTPPro>
13	- <version>2.0.0</version>
14	</Aschroder_SMTPPro>
15	</modules>
16	<frontend>


3	/**
4	* SMTP Pro integration.
5	*
6	+ * @author Ashley Schroder (aschroder.com)
7	+ * @copyright Copyright (c) 2014 Ashley Schroder
8	+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10	-->
11	<config>
12	<modules>
13	<Aschroder_SMTPPro>
14	+ <version>2.0.1</version>
15	</Aschroder_SMTPPro>
16	</modules>
17	<frontend>

app/code/local/Aschroder/SMTPPro/etc/system.xml CHANGED Viewed

	@@ -27,9 +27,9 @@
27	<show_in_default>1</show_in_default>
28	<show_in_website>1</show_in_website>
29	<show_in_store>0</show_in_store>
30	- <comment~~><~~div style='background-color: #efefef;margin-bottom: 10px;height: 40px;'~~>~~ ~~<~~img style='float:left;width: 150px;' src='http://www.aschroder.com/smtppro-logo.png' ~~/>~~ ~~<~~span style='float:left;font-size: 20px; margin:10px;'~~>~~SMTP Pro Email Extension~~</~~span~~>~~ ~~</~~div~~>~~ Configure your SMTP connection below. If you have any questions or would like any help please visit ~~<~~a href='http://magesmtppro.com' target='_blank'~~>~~magesmtppro.com~~</~~a~~>.</~~comment>
31	<fields>
32	- <option translate="label ~~comment~~">
33	<label>Email Connection</label>
34	<frontend_type>select</frontend_type>
35	<source_model>smtppro/system_config_source_smtp_option</source_model>
	@@ -50,9 +50,9 @@
50	<show_in_store>0</show_in_store>
51	<depends><option>google</option></depends>
52	</googleapps_email>
53	- <googleapps_gpassword translate="label">
54	<label>Google Apps Password</label>
55	- <comment>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>
56	<frontend_type>password</frontend_type>
57	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
58	<sort_order>23</sort_order>
	@@ -71,9 +71,9 @@
71	<show_in_store>0</show_in_store>
72	<depends><option>sendgrid</option></depends>
73	</sendgrid_email>
74	- <sendgrid_password translate="label">
75	<label>SendGrid Password</label>
76	- <comment>Input your SendGrid username and password here. For more information visit ~~<~~a href='http://sendgrid.com' target='_blank'~~>~~SendGrid~~</~~a~~></~~comment>
77	<frontend_type>password</frontend_type>
78	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
79	<sort_order>23</sort_order>
	@@ -94,9 +94,9 @@
94	<show_in_store>0</show_in_store>
95	<depends><option>ses</option></depends>
96	</ses_access_key>
97	- <ses_private_key translate="label">
98	<label>Amazon SES Secret Key</label>
99	- <comment>Amazon SES support in SMTP Pro is limited and best suited to development and testing purposes. For a full integration with region selection, error/bounce logging and send statistics please see the premium extension: ~~<~~a href='http://magesend.com' target='_blank'~~>~~MageSend~~</~~a~~></~~comment>
100	<frontend_type>password</frontend_type>
101	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
102	<sort_order>23</sort_order>
	@@ -106,9 +106,7 @@
106	<depends><option>ses</option></depends>
107	</ses_private_key>
108
109	-
110	-
111	- <smtp_authentication translate="label comment">
112	<label>Authentication</label>
113	<frontend_type>select</frontend_type>
114	<source_model>smtppro/system_config_source_smtp_authentication</source_model>
	@@ -118,7 +116,7 @@
118	<show_in_store>0</show_in_store>
119	<depends><option>smtp</option></depends>
120	</smtp_authentication>
121	- <smtp_username translate="label ~~comment~~">
122	<label>Username</label>
123	<frontend_type>text</frontend_type>
124	<sort_order>23</sort_order>
	@@ -127,7 +125,7 @@
127	<show_in_store>0</show_in_store>
128	<depends><option>smtp</option><smtp_authentication separator=",">login,plain,crammd5</smtp_authentication></depends>
129	</smtp_username>
130	- <smtp_password translate="label ~~comment~~">
131	<label>Password</label>
132	<frontend_type>password</frontend_type>
133	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
	@@ -137,7 +135,7 @@
137	<show_in_store>0</show_in_store>
138	<depends><option>smtp</option><smtp_authentication separator=",">login,plain,crammd5</smtp_authentication></depends>
139	</smtp_password>
140	- <smtp_host translate="label ~~comment~~">
141	<label>Host</label>
142	<frontend_type>text</frontend_type>
143	<sort_order>29</sort_order>
	@@ -146,7 +144,7 @@
146	<show_in_store>0</show_in_store>
147	<depends><option>smtp</option></depends>
148	</smtp_host>
149	- <smtp_port translate="label ~~comment~~">
150	<label>Port</label>
151	<frontend_type>text</frontend_type>
152	<sort_order>32</sort_order>
	@@ -157,7 +155,7 @@
157	</smtp_port>
158	<smtp_ssl translate="label comment">
159	<label>SSL Security</label>
160	- <comment>Custom SMTP servers can be configured in this section. For more information about these configuration options and troubleshooting advice please see ~~<~~a href='http://magesmtppro.com' target='_blank'~~>~~magesmtppro.com~~</~~a~~></~~comment>
161	<frontend_type>select</frontend_type>
162	<source_model>smtppro/system_config_source_smtp_ssl</source_model>
163	<sort_order>35</sort_order>
	@@ -170,7 +168,7 @@
170	</fields>
171	</general>
172
173	- <debug module="smtppro" translate="label">
174	<label>Logging and Debugging</label>
175	<frontend_type>text</frontend_type>
176	<sort_order>50</sort_order>
	@@ -181,7 +179,7 @@
181	<fields>
182	<logenabled translate="label comment">
183	<label>Log Emails</label>
184	- <comment>This will log all outbound emails. View from System~~->~~Tools~~->~~SMTPPro - Email Log.</comment>
185	<frontend_type>select</frontend_type>
186	<source_model>adminhtml/system_config_source_yesno</source_model>
187	<sort_order>40</sort_order>
	@@ -200,7 +198,7 @@
200	<show_in_store>0</show_in_store>
201	<depends><logenabled>1</logenabled></depends>
202	</cleanlog>
203	- <cleanlog_after_days translate="label ~~comment~~">
204	<label>Email Log Days Kept</label>
205	<frontend_type>text</frontend_type>
206	<sort_order>60</sort_order>
	@@ -209,7 +207,7 @@
209	<show_in_store>0</show_in_store>
210	<depends><cleanlog>1</cleanlog><logenabled>1</logenabled></depends>
211	</cleanlog_after_days>
212	- <log_debug translate="label ~~comment~~">
213	<label>Enable Debug Logging</label>
214	<comment><![CDATA[If yes, a log file will be written with debug information.]]></comment>
215	<frontend_type>select</frontend_type>
	@@ -238,7 +236,7 @@
238	<show_in_website>1</show_in_website>
239	<show_in_store>1</show_in_store>
240	<fields>
241	- <logenabled translate="label ~~comment~~">
242	<frontend_type>select</frontend_type>
243	<frontend_model>Aschroder_SMTPPro_Block_Adminhtml_Table</frontend_model>
244	<sort_order>40</sort_order>


27	<show_in_default>1</show_in_default>
28	<show_in_website>1</show_in_website>
29	<show_in_store>0</show_in_store>
30	+ <comment><![CDATA[<div style='background-color: #efefef;margin-bottom: 10px;height: 40px;'> <img style='float:left;width: 150px;' src='http://www.aschroder.com/smtppro-logo.png' /> <span style='float:left;font-size: 20px; margin:10px;'>SMTP Pro Email Extension</span> </div> Configure your SMTP connection below. If you have any questions or would like any help please visit <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>.]]></comment>
31	<fields>
32	+ <option translate="label">
33	<label>Email Connection</label>
34	<frontend_type>select</frontend_type>
35	<source_model>smtppro/system_config_source_smtp_option</source_model>

50	<show_in_store>0</show_in_store>
51	<depends><option>google</option></depends>
52	</googleapps_email>
53	+ <googleapps_gpassword translate="label comment">
54	<label>Google Apps Password</label>
55	+ <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>
56	<frontend_type>password</frontend_type>
57	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
58	<sort_order>23</sort_order>

71	<show_in_store>0</show_in_store>
72	<depends><option>sendgrid</option></depends>
73	</sendgrid_email>
74	+ <sendgrid_password translate="label comment">
75	<label>SendGrid Password</label>
76	+ <comment><![CDATA[Input your SendGrid username and password here. For more information visit <a href='http://sendgrid.com' target='_blank'>SendGrid</a>]]></comment>
77	<frontend_type>password</frontend_type>
78	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
79	<sort_order>23</sort_order>

94	<show_in_store>0</show_in_store>
95	<depends><option>ses</option></depends>
96	</ses_access_key>
97	+ <ses_private_key translate="label comment">
98	<label>Amazon SES Secret Key</label>
99	+ <comment><![CDATA[Amazon SES support in SMTP Pro is limited and best suited to development and testing purposes. For a full integration with region selection, error/bounce logging and send statistics please see the premium extension: <a href='http://magesend.com' target='_blank'>MageSend</a>]]></comment>
100	<frontend_type>password</frontend_type>
101	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
102	<sort_order>23</sort_order>

106	<depends><option>ses</option></depends>
107	</ses_private_key>
108
109	+ <smtp_authentication translate="label">


110	<label>Authentication</label>
111	<frontend_type>select</frontend_type>
112	<source_model>smtppro/system_config_source_smtp_authentication</source_model>

116	<show_in_store>0</show_in_store>
117	<depends><option>smtp</option></depends>
118	</smtp_authentication>
119	+ <smtp_username translate="label">
120	<label>Username</label>
121	<frontend_type>text</frontend_type>
122	<sort_order>23</sort_order>

125	<show_in_store>0</show_in_store>
126	<depends><option>smtp</option><smtp_authentication separator=",">login,plain,crammd5</smtp_authentication></depends>
127	</smtp_username>
128	+ <smtp_password translate="label">
129	<label>Password</label>
130	<frontend_type>password</frontend_type>
131	<backend_model>adminhtml/system_config_backend_encrypted</backend_model>

135	<show_in_store>0</show_in_store>
136	<depends><option>smtp</option><smtp_authentication separator=",">login,plain,crammd5</smtp_authentication></depends>
137	</smtp_password>
138	+ <smtp_host translate="label">
139	<label>Host</label>
140	<frontend_type>text</frontend_type>
141	<sort_order>29</sort_order>

144	<show_in_store>0</show_in_store>
145	<depends><option>smtp</option></depends>
146	</smtp_host>
147	+ <smtp_port translate="label">
148	<label>Port</label>
149	<frontend_type>text</frontend_type>
150	<sort_order>32</sort_order>

155	</smtp_port>
156	<smtp_ssl translate="label comment">
157	<label>SSL Security</label>
158	+ <comment><![CDATA[Custom SMTP servers can be configured in this section. For more information about these configuration options and troubleshooting advice please see <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>]]></comment>
159	<frontend_type>select</frontend_type>
160	<source_model>smtppro/system_config_source_smtp_ssl</source_model>
161	<sort_order>35</sort_order>

168	</fields>
169	</general>
170
171	+ <debug module="smtppro" translate="label comment">
172	<label>Logging and Debugging</label>
173	<frontend_type>text</frontend_type>
174	<sort_order>50</sort_order>

179	<fields>
180	<logenabled translate="label comment">
181	<label>Log Emails</label>
182	+ <comment>This will log all outbound emails. View from System->Tools->SMTPPro - Email Log.</comment>
183	<frontend_type>select</frontend_type>
184	<source_model>adminhtml/system_config_source_yesno</source_model>
185	<sort_order>40</sort_order>

198	<show_in_store>0</show_in_store>
199	<depends><logenabled>1</logenabled></depends>
200	</cleanlog>
201	+ <cleanlog_after_days translate="label">
202	<label>Email Log Days Kept</label>
203	<frontend_type>text</frontend_type>
204	<sort_order>60</sort_order>

207	<show_in_store>0</show_in_store>
208	<depends><cleanlog>1</cleanlog><logenabled>1</logenabled></depends>
209	</cleanlog_after_days>
210	+ <log_debug translate="label">
211	<label>Enable Debug Logging</label>
212	<comment><![CDATA[If yes, a log file will be written with debug information.]]></comment>
213	<frontend_type>select</frontend_type>

236	<show_in_website>1</show_in_website>
237	<show_in_store>1</show_in_store>
238	<fields>
239	+ <logenabled translate="label">
240	<frontend_type>select</frontend_type>
241	<frontend_model>Aschroder_SMTPPro_Block_Adminhtml_Table</frontend_model>
242	<sort_order>40</sort_order>

app/code/local/Aschroder/SMTPPro/sql/smtppro_setup/mysql4-install-1.1.0.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/code/local/Aschroder/SMTPPro/sql/smtppro_setup/mysql4-upgrade-1.4.3-1.4.4.php CHANGED Viewed

	@@ -1,10 +1,9 @@
1	<?php
2	/**
3	*
4	- *
5	- * @author Ashley Schroder (aschroder.com)
6	* @author Paul Hachmang (@paales)
7	- * @~~copyright Copyright~~ ~~(c) 2010~~ Ashley Schroder

8	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
9	*/
10


1	<?php
2	/**
3	*


4	* @author Paul Hachmang (@paales)
5	+ * @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9

app/design/adminhtml/{default → base}/default/template/smtppro/view.phtml RENAMED Viewed

	@@ -3,7 +3,7 @@
3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	- * @copyright Copyright (c) ~~2010~~ Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9	?>


3	*
4	*
5	* @author Ashley Schroder (aschroder.com)
6	+ * @copyright Copyright (c) 2014 Ashley Schroder
7	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
8	*/
9	?>

app/locale/en_US/Aschroder_SMTPPro.csv ADDED Viewed

	@@ -0,0 +1,79 @@


1	+ "SMTPPro - Email Log","SMTPPro - Email Log"
2	+ "SMTP Pro Email Settings","SMTP Pro Email Settings"
3	+ "Email Log","Email Log"
4	+ "Aschroder Extensions","Aschroder Extensions"
5	+ "SMTP Pro","SMTP Pro"
6	+ "General Settings","General Settings"
7	+ "<div style='background-color: #efefef;margin-bottom: 10px;height: 40px;'> <img style='float:left;width: 150px;' src='http://www.aschroder.com/smtppro-logo.png' /> <span style='float:left;font-size: 20px; margin:10px;'>SMTP Pro Email Extension</span> </div> Configure your SMTP connection below. If you have any questions or would like any help please visit <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>.","<div style='background-color: #efefef;margin-bottom: 10px;height: 40px;'> <img style='float:left;width: 150px;' src='http://www.aschroder.com/smtppro-logo.png' /> <span style='float:left;font-size: 20px; margin:10px;'>SMTP Pro Email Extension</span> </div> Configure your SMTP connection below. If you have any questions or would like any help please visit <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>."
8	+ "Email Connection","Email Connection"
9	+ "Google Apps Email Address","Google Apps Email Address"
10	+ "Google Apps Password","Google Apps Password"
11	+ "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>","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>"
12	+ "SendGrid Username","SendGrid Username"
13	+ "SendGrid Password","SendGrid Password"
14	+ "Input your SendGrid username and password here. For more information visit <a href='http://sendgrid.com' target='_blank'>SendGrid</a>","Input your SendGrid username and password here. For more information visit <a href='http://sendgrid.com' target='_blank'>SendGrid</a>"
15	+ "Amazon SES Access Key","Amazon SES Access Key"
16	+ "Amazon SES Secret Key","Amazon SES Secret Key"
17	+ "Amazon SES support in SMTP Pro is limited and best suited to development and testing purposes. For a full integration with region selection, error/bounce logging and send statistics please see the premium extension: <a href='http://magesend.com' target='_blank'>MageSend</a>","Amazon SES support in SMTP Pro is limited and best suited to development and testing purposes. For a full integration with region selection, error/bounce logging and send statistics please see the premium extension: <a href='http://magesend.com' target='_blank'>MageSend</a>"
18	+ "Authentication","Authentication"
19	+ "Username","Username"
20	+ "Password","Password"
21	+ "Host","Host"
22	+ "Port","Port"
23	+ "SSL Security","SSL Security"
24	+ "Custom SMTP servers can be configured in this section. For more information about these configuration options and troubleshooting advice please see <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>","Custom SMTP servers can be configured in this section. For more information about these configuration options and troubleshooting advice please see <a href='http://magesmtppro.com' target='_blank'>magesmtppro.com</a>"
25	+ "Logging and Debugging","Logging and Debugging"
26	+ "Please only use these settings if you are a software developer or server admin.","Please only use these settings if you are a software developer or server admin."
27	+ "Log Emails","Log Emails"
28	+ "This will log all outbound emails. View from System->Tools->SMTPPro - Email Log.","This will log all outbound emails. View from System->Tools->SMTPPro - Email Log."
29	+ "Clean Email Logs","Clean Email Logs"
30	+ "If this is set to yes, old entries will be deleted from email log. Cron is required and log cleaning must be enabled in system/log/enabled for this to work.","If this is set to yes, old entries will be deleted from email log. Cron is required and log cleaning must be enabled in system/log/enabled for this to work."
31	+ "Email Log Days Kept","Email Log Days Kept"
32	+ "Enable Debug Logging","Enable Debug Logging"
33	+ "If yes, a log file will be written with debug information.","If yes, a log file will be written with debug information."
34	+ "Save settings before running this test.","Save settings before running this test."
35	+ "Compatible Email Services","Compatible Email Services"
36	+ "Running SMTP Pro Self Test","Running SMTP Pro Self Test"
37	+ "SMTP Pro Self Test Results","SMTP Pro Self Test Results"
38	+ "Extension disabled, cannot run test.","Extension disabled, cannot run test."
39	+ "Checking config re-writes have not clashed.","Checking config re-writes have not clashed."
40	+ ""Detected overwrite conflict: %s","Detected overwrite conflict: %s"
41	+ "Raw connection test for SMTP options.","Raw connection test for SMTP options."
42	+ "Complete","Complete"
43	+ "Failed to connect to SMTP server. Reason: ","Failed to connect to SMTP server. Reason: "
44	+ "This extension requires an outbound SMTP connection on port: ","This extension requires an outbound SMTP connection on port: "
45	+ "Connection to Host SMTP server successful","Connection to Host SMTP server successful"
46	+ "Skipping raw connection test for non-SMTP options.","Skipping raw connection test for non-SMTP options."
47	+ "Test Email From SMTP Pro Magento Extension","Test Email From SMTP Pro Magento Extension"
48	+ "Actual email sending test...","Actual email sending test..."
49	+ " from: "," from: "
50	+ "Test email was sent successfully","Test email was sent successfully"
51	+ "Failed to find transport for test.","Failed to find transport for test."
52	+ "Unable to send test email.","Unable to send test email."
53	+ "Exception message was: %s","Exception message was: %s"
54	+
55	+ "Please check the user guide for frequent error messages and their solutions.","Please check the user guide for frequent error messages and their solutions."
56	+ "Test email was not sent successfully: %s","Test email was not sent successfully: %s"
57	+ "See exception log for more details.","See exception log for more details."
58	+ "Checking that a template exists for the default locale and that email communications are enabled...","Checking that a template exists for the default locale and that email communications are enabled..."
59	+ "Default templates exist.","Default templates exist."
60	+ "Email communications are enabled.","Email communications are enabled."
61	+ "Default templates exist and email communications are enabled.","Default templates exist and email communications are enabled."
62	+ "Could not find default template, or template not valid, or email communications disabled in Advanced > System settings.","Could not find default template, or template not valid, or email communications disabled in Advanced > System settings."
63	+ "Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails. Also check Advanced > System settings to ensure email communications are enabled.","Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails. Also check Advanced > System settings to ensure email communications are enabled."
64	+ "Could not find default template, or template not valid, or email communications disabled in Advanced > System settings","Could not find default template, or template not valid, or email communications disabled in Advanced > System settings"
65	+ "Could not test default template validity.","Could not test default template validity."
66	+ "Exception message was: %s","Exception message was: %s"
67	+ "Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails.","Please check that you have templates in place for your emails. These are in app/locale, or custom defined in System > Transaction Emails."
68	+ "Could not test default template validity: %s","Could not test default template validity: %s"
69	+ "Checking that tables are created...","Checking that tables are created..."
70	+ "Could not find required database tables.","Could not find required database tables."
71	+ "Please try to manually re-run the table creation script. For assistance please contact us.","Please try to manually re-run the table creation script. For assistance please contact us."
72	+ "Could not find required tables.","Could not find required tables."
73	+ "Required database tables exist.",""
74	+ "Could not find required database tables.","Could not find required database tables."
75	+ "Exception message was: %s","Exception message was: %s"
76	+ "Please try to manually re-run the table creation script. For assistance please contact us.","Please try to manually re-run the table creation script. For assistance please contact us."
77	+ "Could not find required tables: %s","Could not find required tables: %s"
78	+ "Testing complete, if you are still experiencing difficulties please visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.","Testing complete, if you are still experiencing difficulties please visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support."
79	+ "Testing failed, please review the reported problems and if you need further help visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support.","Testing failed, please review the reported problems and if you need further help visit <a target='_blank' href='http://magesmtppro.com'>the support page</a> or contact me via <a target='_blank' href='mailto:support@aschroder.com'>support@aschroder.com</a> for support."

composer.json ADDED Viewed

	@@ -0,0 +1,13 @@


1	+ {
2	+ "name": "aschroder/smtp_pro",
3	+ "type": "magento-module",
4	+ "description": "sending Magento mail through an external smtp-server",
5	+ "homepage":"https://github.com/aschroder/Magento-SMTP-Pro-Email-Extension",
6	+ "require": {
7	+ "magento-hackathon/magento-composer-installer": "*"
8	+ },
9	+ "authors":[
10	+ {"name": "aschroder"
11	+ }
12	+ ]
13	+ }

modman ADDED Viewed

	@@ -0,0 +1,9 @@


1	+ # modman module description
2	+ # see https://github.com/colinmollenhour/modman/ for more info
3	+ # author: Ashley
4	+
5	+ #SMTP Pro
6	+ app/etc/modules/Aschroder_SMTPPro.xml app/etc/modules/Aschroder_SMTPPro.xml
7	+ app/code/local/Aschroder/SMTPPro/ app/code/local/Aschroder/SMTPPro/
8	+ app/design/adminhtml/base/default/template/smtppro/ app/design/adminhtml/default/default/template/smtppro/
9	+ app/locale/en_US/Aschroder_SMTPPro.csv app/locale/en_US/Aschroder_SMTPPro.csv

package.xml CHANGED Viewed

@@ -1,20 +1,2 @@
             <?xml version="1.0"?>
-            -
            <package>
-            -
                <name>ASchroder_SMTPPro</name>
-            -
                <version>2.0.0</version>
-            -
                <stability>stable</stability>
-            -
                <license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
-            -
                <channel>community</channel>
-            -
                <extends/>
-            -
                <summary>Robust, Free and Open Source SMTP, Gmail, SendGrid and Google Apps Email support for Magento</summary>
-            -
                <description>This extension provides complete control of Email settings for Magento. It can send with any custom SMTP server, your GMail or Google Apps account</description>
-            -
                <notes>2.0.0 - Version 2 is a complete rewrite and refresh of the extension. Full support for newer versions of Magento.&#xD;
-            -
            &#xD;
-            -
            As of 2014 - All prior releases available on github, but no longer supported.</notes>
-            -
                <authors><author><name>ASchroder</name><user>ashleys22</user><email>ashley.schroder@gmail.com</email></author></authors>
-            -
                <date>2014-05-01</date>
-            -
                <time>11:48:14</time>
-            -
                <contents><target name="magelocal"><dir name="Aschroder"><dir name="SMTPPro"><dir name="Block"><dir name="Adminhtml"><file name="Table.php" hash="b1ce1d8c837b32e5b6ebc947a837e99d"/><file name="Test.php" hash="392fe708a973b6fdd3e4d8d8af2aeb70"/></dir><dir name="Log"><file name="Grid.php" hash="e15ba1de3a2d09ff12f3f7bff6fcde10"/><file name="View.php" hash="396702d55673f05961cf646525212534"/></dir><file name="Log.php" hash="d2a7233ec0fd3f20d048f3dd412f61a3"/></dir><dir name="Helper"><file name="Data.php" hash="4f1537614a0df30c1cfba463b4d01080"/><dir name="Mysql4"><file name="Install.php" hash="4debbbeb4e2978c28685145edc1b2caa"/></dir></dir><dir name="Model"><dir name="Email"><file name="Log.php" hash="c099f9c0b7e0d19c951ac2b6f889bbf3"/><file name="Template.php" hash="754a3ec71cc4f66509a40e3568250eff"/></dir><file name="Email.php" hash="5c1dd2d775c4069c541a22b64bcf51bc"/><dir name="Mysql4"><dir name="Email"><dir name="Log"><file name="Collection.php" hash="8ca40c787081eb19f665e8033bfd5025"/></dir><file name="Log.php" hash="f96a10f9d4de72dffb278adced8647c4"/></dir><file name="Setup.php" hash="a1f73ffd26ddd42a9789b071a40b2450"/></dir><file name="Observer.php" hash="5aa51e49e2535f5d7a7414d988586b6a"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Smtp"><file name="Authentication.php" hash="ed63c8a65c817ece5ea5c56fe470b75e"/><file name="Development.php" hash="2f9b6177e6063c2d42483c9af65995d3"/><file name="Option.php" hash="ec87644abbcd4cacec1c745416df30a1"/><file name="Ssl.php" hash="ae9af390a40b8bcebbc8451a9152821f"/></dir></dir></dir></dir><dir name="Transports"><file name="Basesmtp.php" hash="b39db5c094b60e3628ee087d47c9e7c1"/><file name="Disabled.php" hash="cf6545e7e696c536ba3aef76b7edadf3"/><file name="Google.php" hash="66efa5bdb12f5fecf68077cd9fd0de4e"/><file name="Sendgrid.php" hash="f5ea76686a1a37c9b1417cb67455a576"/><file name="Ses.php" hash="eacd94561ec46594a1a14fc9d12a4c89"/><file name="Smtp.php" hash="8e60c0ca9d6f68a8c606831273a2b545"/></dir></dir><dir name="controllers"><file name="LogController.php" hash="b6819bb30738db7416ca241303e5b1fd"/><file name="TestController.php" hash="884367d14631ce3090862509156a1ba7"/></dir><dir name="etc"><file name="config.xml" hash="2c106ee99507cca6e502e36c2427c22c"/><file name="system.xml" hash="0e4968c0e7d3f3e7f7ef4068bb805ed5"/></dir><dir name="lib"><file name="AmazonSES.php" hash="487803f8f337e780a3284606363a0ce8"/></dir><dir name="sql"><dir name="smtppro_setup"><file name="mysql4-install-1.1.0.php" hash="344225e3f373f0c4f6c506cdb84c088f"/><file name="mysql4-upgrade-1.4.3-1.4.4.php" hash="b91bf0f951390b1d1da7f54d36e5cb0a"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="smtppro"><file name="view.phtml" hash="6a6c558348b5205e8dd9ebbd265c47bc"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aschroder_SMTPPro.xml" hash="23c719e9ecb45c14d29ab24d3e2bd7a1"/></dir></target></contents>
-            -
                <compatible/>
-            -
                <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
-            -
            </package>


1	<?xml version="1.0"?>
2	+ <package><name>ASchroder_SMTPPro</name><version>2.0.1</version><stability>stable</stability><license>OSL</license><channel>community</channel><extends></extends><summary>Robust, Free and Open Source SMTP, Gmail, SendGrid and Google Apps Email support for Magento</summary><description>This extension provides complete control of Email settings for Magento. It can send with any custom SMTP server, your GMail or Google Apps account</description><notes>See magesmtppro.com for full release notes</notes><authors><author><name>ASchroder</name><user>ashleys22</user><email>ashley.schroder@gmail.com</email></author></authors><date>2014-05-04</date><time>2:18:03</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><file name="README" hash="8239c38097e81000530254c0a28d125c"/><file name="composer.json" hash="572b4738922b0f2c9cc7e4e5da280db0"/><file name="modman" hash="6d9cad597b76568b18856eec6f2301b3"/><dir name="app"><dir name="code"><dir name="local"><dir name="Aschroder"><dir name="SMTPPro"><dir name="Block"><file name="Log.php" hash="f8b34b4602051fdee4c48c289c910eff"/><dir name="Adminhtml"><file name="Table.php" hash="ebb9d19c7cefe83f5825015fbb30f802"/><file name="Test.php" hash="6e5979b8f81ad3aa62dff78ad04945f0"/></dir><dir name="Log"><file name="Grid.php" hash="0b27168a786a59e97d191bae7de0f575"/><file name="View.php" hash="b06eba5c7279a7426537b695920c5f90"/></dir></dir><dir name="controllers"><file name="LogController.php" hash="f2bf802aa0dde04764e2d8cde3f00612"/><file name="TestController.php" hash="1e87bf2d9e542431f632fff0dfe21b6a"/></dir><dir name="etc"><file name="config.xml" hash="cbd9ea299fc2507053ed6f9cf3efd218"/><file name="system.xml" hash="d4eaf2484ff99c5725dc6817b9bfedbf"/></dir><dir name="Helper"><file name="Data.php" hash="4f1537614a0df30c1cfba463b4d01080"/><dir name="Mysql4"><file name="Install.php" hash="2b00edc32e832c8dff3b320027bdb10d"/></dir></dir><dir name="lib"><file name="AmazonSES.php" hash="487803f8f337e780a3284606363a0ce8"/></dir><dir name="Model"><file name="Email.php" hash="454761288409daa56cffb6cf078508f8"/><file name="Observer.php" hash="3fb9ff86c43cdf70023bbfbe3d6455f6"/><dir name="Email"><file name="Log.php" hash="99d2a9634e8668cf756683cc85f47cd5"/><file name="Template.php" hash="44f052d5d90f94fe4a17906206797dba"/></dir><dir name="Mysql4"><file name="Setup.php" hash="7204352ba2ba3e0bd8948a35edd326e4"/><dir name="Email"><file name="Log.php" hash="13d71e0e47e54f221dc2f5b2ec1ae885"/><dir name="Log"><file name="Collection.php" hash="419b27274424f5bce6d704ab5a288ec9"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><dir name="Smtp"><file name="Authentication.php" hash="ac4c2e3fae66365bfe5c8b30c12cebea"/><file name="Option.php" hash="e8443f1f0845d2a2dc1fae1949e0812d"/><file name="Ssl.php" hash="8a4cd480e637ea72b6c6e081f661a1b7"/></dir></dir></dir></dir><dir name="Transports"><file name="Basesmtp.php" hash="e916cb83b4106e453c70b771464f2a46"/><file name="Disabled.php" hash="cf6545e7e696c536ba3aef76b7edadf3"/><file name="Google.php" hash="66efa5bdb12f5fecf68077cd9fd0de4e"/><file name="Sendgrid.php" hash="f5ea76686a1a37c9b1417cb67455a576"/><file name="Ses.php" hash="247f9c8a59b40908e0fa3366cbe80007"/><file name="Smtp.php" hash="8e60c0ca9d6f68a8c606831273a2b545"/></dir></dir><dir name="sql"><dir name="smtppro_setup"><file name="mysql4-install-1.1.0.php" hash="c69c20faa54aeff30fab13a475c349fe"/><file name="mysql4-upgrade-1.4.3-1.4.4.php" hash="357c10ec32e3795d8170055b27c7d87c"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="smtppro"><file name="view.phtml" hash="865ac495aaa0eca28678cba3a4be924f"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Aschroder_SMTPPro.xml" hash="23c719e9ecb45c14d29ab24d3e2bd7a1"/></dir></dir><dir name="locale"><dir name="en_US"><file name="Aschroder_SMTPPro.csv" hash="91060a326d1915adeb2f94780e84ac86"/></dir></dir></dir></target></contents></package>