Changeset 2682

Timestamp:

05/21/2008 09:18:46 AM (5 months ago)

Author:

Shadowhand

Message:

Fixing #576

Location:

trunk/system

Files:

• config/email.php (modified) (1 diff)
• helpers/email.php (modified) (1 diff)

trunk/system/config/email.php

@@ -12 +12 @@
 
 /**
+ * To use secure connections with SMTP, set "port" to 465 instead of 25.
+ * To enable TLS, set "encryption" to "tls".
+ *
  * Driver options:
  * @param   null    native: no options
  * @param   string  sendmail: executable path, with -bs or equivalent attached
- * @param   array   smtp: hostname, (username), (password), (port), (auth)
+ * @param   array   smtp: hostname, (username), (password), (port), (auth), (encryption)
  */
 $config['options'] = NULL;

trunk/system/helpers/email.php

@@ -38 +38 @@
                 {
                         case 'smtp':
+                                // Set port
+                                $port = empty($config['options']['port']) ? 25 : (int) $config['options']['port'];
+
+                                if (empty($config['options']['encryption']))
+                                {
+                                        // No encryption
+                                        $encryption = Swift_Connection_SMTP::ENC_OFF;
+                                }
+                                else
+                                {
+                                        // Set encryption
+                                        switch (strtolower($config['options']['encryption']))
+                                        {
+                                                case 'tls': $encryption = Swift_Connection_SMTP::ENC_TLS; break;
+                                                case 'ssl': $encryption = Swift_Connection_SMTP::ENC_SSL; break;
+                                        }
+                                }
+
                                 // Create a SMTP connection
-                                $connection = new Swift_Connection_SMTP
-                                (
-                                        $config['options']['hostname'],
-                                        empty($config['options']['port']) ? 25 : (int) $config['options']['port']
-                                );
+                                $connection = new Swift_Connection_SMTP($config['options']['hostname'], $port, $encryption);
 
                                 // Do authentication, if part of the DSN