Correct config

Lib/Config/BaseEmailConfig.php

@@ -1,17 +1,31 @@
 <?php
 // Support BC (snake case config)
-if (!Configure::read('Mail.smtp_host')) {
+if (!Configure::read('Mail.smtpHost')) {
 	Configure::write('Mail.smtpHost', Configure::read('Mail.smtp_host'));
 }
-if (!Configure::read('Mail.smtp_username')) {
+if (!Configure::read('Mail.smtpUsername')) {
 	Configure::write('Mail.smtpUsername', Configure::read('Mail.smtp_username'));
 }
-if (!Configure::read('Mail.smtp_password')) {
+if (!Configure::read('Mail.smtpPassword')) {
 	Configure::write('Mail.smtpPassword', Configure::read('Mail.smtp_password'));
 }
 
 /**
  * BaseEmailConfig for APP/Config/email.php
+ *
+ * You can set up your $default and other configs without having to specify a password
+ * Those will be read from Configure::read('Email.Pwd').
+ *
+ * You can also specify a few more things via Configure, e.g. 'Email.live' to force sending emails.
+ * Per default it would not send mails in debug mode, but log them away.
+ *
+ * Additionally, you can set custom SMTP configs via Configure::read('Mail'):
+ * - smtpHost
+ * - smtpUsername
+ * - smtpPassword
+ * Those will then be merged in.
+ *
+ * Your email.php config file then should not contain any sensitive information and can be part of version control.
  */
 class BaseEmailConfig {
 
@@ -24,13 +38,6 @@ class BaseEmailConfig {
 	 * Also assigns custom Mail config as well as log/trace configs.
 	 */
 	public function __construct() {
-		$pwds = (array)Configure::read('Email.Pwd');
-		foreach ($pwds as $key => $val) {
-			if (isset($this->{$key})) {
-				$this->{$key}['password'] = $val;
-			}
-		}
-
 		if (!empty($this->default['log'])) {
 			$this->default['report'] = true;
 		}
@@ -57,6 +64,22 @@ class BaseEmailConfig {
 			if (!empty($config['smtpPassword'])) {
 				$this->default['password'] = $config['smtpPassword'];
 			}
+			if (!empty($config['smtpPort'])) {
+				$this->default['port'] = $config['smtpPort'];
+			}
+			if (isset($config['smtpTimeout'])) {
+				$this->default['timeout'] = $config['smtpTimeout'];
+			}
+			if (isset($config['smtpTls'])) {
+				$this->default['tls'] = $config['smtpTls'];
+			}
+		}
+
+		$pwds = (array)Configure::read('Email.Pwd');
+		foreach ($pwds as $key => $val) {
+			if (isset($this->{$key})) {
+				$this->{$key}['password'] = $val;
+			}
 		}
 	}