Switch to dynamic transport system.

classes/kohana/mailer.php

@@ -224,44 +224,14 @@ public function connect( $config = "default" )
 		// Load configuration
 		$config = Kohana::config('mailer.'.$config);
 
-		$transport = $config['transport'];
+		$transport = ( is_null( $config['transport'] ) ) ? 'native' : $config['transport'];
 		$config = $config['options'];
-
-		switch ( $transport )
-		{
-			case 'smtp':
-
-				//Create the Transport
-				$transport = Swift_SmtpTransport::newInstance()
-								->setHost(empty($config['hostname']) ? "localhost" : (string) $config['hostname'])
-								->setUsername(empty($config['username']) ? NULL : (string) $config['username'])
-								->setPassword(empty($config['password']) ? NULL : (string) $config['password']);
-
-				//Port?
-				$port = empty($config['port']) ? 25 : (int) $config['port'];
-				$transport->setPort($port);
-
-				//Use encryption?
-				if (! empty($config['encryption']))
-				{
-					$transport->setEncryption($config['encryption']);
-				}
-
-			break;
-
-			case 'sendmail':
-				// Create a sendmail connection
-				$transport = Swift_SendmailTransport::newInstance(empty($config['options']) ? "/usr/sbin/sendmail -bs" : $config['options']);
-			break;
-
-			default:
-				// Use the native connection
-				$transport = Swift_MailTransport::newInstance($config['options']);
-			break;
-		}
 
-		//Create the Mailer using the appropriate transport
-		return $this->_mailer = Swift_Mailer::newInstance($transport);
+		$klass = 'Mailer_Transport_' . ucfirst($transport);
+		$factory = new $klass();
+
+		//Create the Mailer
+		return $this->_mailer = Swift_Mailer::newInstance($factory->build($config));
 	}
 
 	/**
@@ -484,4 +454,4 @@ protected function set_data(& $view)
         return $view;
     }
 
-}// end of Mailer
+}// end of Mailer

classes/kohana/mailer/transport.php

@@ -0,0 +1,6 @@
+<?php
+
+	abstract class Kohana_Mailer_Transport {
+		public function build ( $config ) {}
+	}
+

classes/kohana/mailer/transport/native.php

@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Kohana_Mailer_Transport_Native extends Kohana_Mailer_Transport {
+
+		public function build ( $config ) {
+			return Swift_MailTransport::newInstance();
+		}
+
+	}
+

classes/kohana/mailer/transport/sendmail.php

@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Kohana_Mailer_Transport_Sendmail extends Kohana_Mailer_Transport {
+
+		public function build ( $config ) {
+			return Swift_SendmailTransport::newInstance(empty($config['options']) ? "/usr/sbin/sendmail -bs" : $config['options']);
+		}
+
+	}
+

classes/kohana/mailer/transport/smtp.php

@@ -0,0 +1,26 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Kohana_Mailer_Transport_SMTP extends Kohana_Mailer_Transport {
+
+		public function build ( $config ) {
+			//Create the Transport
+			$transport = Swift_SmtpTransport::newInstance()
+							->setHost(empty($config['hostname']) ? "localhost" : (string) $config['hostname'])
+							->setUsername(empty($config['username']) ? NULL : (string) $config['username'])
+							->setPassword(empty($config['password']) ? NULL : (string) $config['password']);
+
+			//Port?
+			$port = empty($config['port']) ? 25 : (int) $config['port'];
+			$transport->setPort($port);
+
+			//Use encryption?
+			if (! empty($config['encryption']))
+			{
+				$transport->setEncryption($config['encryption']);
+			}
+
+			return $transport;
+		}
+
+	}
+

classes/mailer/transport/native.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Mailer_Transport_Native extends Kohana_Mailer_Transport_Native {}

classes/mailer/transport/sendmail.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Mailer_Transport_Sendmail extends Kohana_Mailer_Transport_Sendmail {}

classes/mailer/transport/smtp.php

@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+	class Mailer_Transport_SMTP extends Kohana_Mailer_Transport_SMTP {}