Changeset 2505

Timestamp:

04/15/2008 11:12:28 AM (6 months ago)

Author:

Shadowhand

Message:

Fixing #450, thanks Mihai!

Location:

trunk/system

Files:

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

trunk/system/config/email.php

@@ -15 +15 @@
  * @param   null    native: no options
  * @param   string  sendmail: executable path, with -bs or equivalent attached
- * @param   array   smtp: hostname, (username), (password), (port)
+ * @param   array   smtp: hostname, (username), (password), (port), (auth)
  */
 $config['options'] = NULL;

trunk/system/helpers/email.php

@@ -49 +49 @@
                                 empty($config['options']['password']) or $connection->setPassword($config['options']['password']);
 
+                                if ( ! empty($config['options']['auth']))
+                                {
+                                        // Get the class name and params
+                                        list ($class, $params) = arr::callback_string($config['options']['auth']);
+
+                                        if ($class === 'PopB4Smtp')
+                                        {
+                                                // Load the PopB4Smtp class manually, due to it's odd filename
+                                                require_once Kohana::find_file('vendor', 'swift/Swift/Authenticator/$PopB4Smtp$');
+                                        }
+
+                                        // Prepare the class name for auto-loading
+                                        $class = 'Swift_Authenticator_'.$class;
+
+                                        // Attach the authenticator
+                                        $connection->attachAuthenticator(($params === NULL) ? new $class : new $class($params[0]));
+                                }
+
                                 // Set the timeout to 5 seconds
-                                $connection->setTimeout(5);
+                                $connection->setTimeout(empty($config['options']['timeout']) ? 5 : (int) $config['options']['timeout']);
                         break;
                         case 'sendmail':