Changeset 1903

Timestamp:

02/02/2008 09:37:18 PM (10 months ago)

Author:

Shadowhand

Message:

Cleaning up email helper.

Location:

trunk/system

Files:

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

trunk/system/config/email.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * Mail connection DSN, used with the email helper.
+ * SwiftMailer driver, used with the email helper.
  *
- * PHP mail function - native://mail
- * Server sendmail   - sendmail:///path/to/sendmail
- * External SMTP     - smtp://user:password@host:port
+ * @see http://www.swiftmailer.org/wikidocs/v3/connections/nativemail
+ * @see http://www.swiftmailer.org/wikidocs/v3/connections/sendmail
+ * @see http://www.swiftmailer.org/wikidocs/v3/connections/smtp
+ *
+ * Valid drivers are: native, sendmail, smtp
  */
-$config['dsn'] = 'native://mail';
+$config['driver'] = 'native';
+
+/**
+ * Driver options:
+ * @param   null    native: no options
+ * @param   string  sendmail: executable path, with -bs or equivalent attached
+ * @param   array   smtp: hostname, (username), (password), (port)
+ */
+$config['options'] = NULL;

trunk/system/helpers/email.php

@@ -21 +21 @@
          * @return  void
          */
-        public static function connect($dsn = NULL)
+        public static function connect($config = NULL)
         {
                 // Load default configuration
-                ($dsn === NULL) and $dsn = Config::item('email.dsn');
+                ($config === NULL) and $config = Config::item('email');
 
                 if ( ! class_exists('Swift', FALSE))
@@ -35 +35 @@
                 }
 
-                if (substr($dsn, 0, 4) === 'smtp')
+                switch ($config['driver'])
                 {
-                        $dsn = parse_url($dsn);
+                        case 'smtp':
+                                // Create a SMTP connection
+                                $connection = new Swift_Connection_SMTP
+                                (
+                                        $config['hostname'], 
+                                        empty($config['options']['port']) ? 25 : $config['options']['port']
+                                );
 
-                        // Create the connection
-                        $connection = new Swift_Connection_SMTP($dsn['host'], empty($dsn['port']) ? 25 : (int) $dsn['port']);
+                                // Do authentication, if part of the DSN
+                                empty($config['options']['username']) or $connection->setUsername($config['options']['username']);
+                                empty($config['options']['password']) or $connection->setPassword($config['options']['password']);
 
-                        // Do authentication, if part of the DSN
-                        empty($dsn['user']) or $connection->setUsername($dsn['user']);
-                        empty($dsn['pass']) or $connection->setPassword($dsn['pass']);
+                                // Set the timeout to 5 seconds
+                                $connection->setTimeout(5);
+                        break;
+                        case 'sendmail':
+                                // Create a sendmail connection
+                                $connection = new Swift_Connection_Sendmail
+                                (
+                                        empty($config['options']) ? Swift_Connection_Sendmail::AUTO_DETECT : $config['options']
+                                );
 
-                        // Set the timeout to 5 seconds
-                        $connection->setTimeout(5);
-                }
-                elseif (substr($dsn, 0, 8) === 'sendmail')
-                {
-                        if (($dsn = substr($dsn, 11)) === '')
-                        {
-                                // Auto-detect the paths
-                                $dsn = Swift_Connection_Sendmail::AUTO_DETECT;
-                        }
-                        else
-                        {
-                                // Add the sendmail flags
-                                $dsn.= ' -bs';
-                        }
-
-                        // Use the sendmail connection
-                        $connection = new Swift_Connection_Sendmail($dsn);
-
-                        // Set the timeout to 5 seconds
-                        $connection->setTimeout(5);
-                }
-                else
-                {
-                        // Use the native connection
-                        $connection = new Swift_Connection_NativeMail;
+                                // Set the timeout to 5 seconds
+                                $connection->setTimeout(5);
+                        break;
+                        default:
+                                // Use the native connection
+                                $connection = new Swift_Connection_NativeMail;
+                        break;
                 }