Better image for settings

It's now sexy, contains images and explains settings!

.gitignore

@@ -1 +1,2 @@
 *.swp
+.idea

README.md

@@ -1,11 +1,37 @@
 # ident_switch
 ident_switch plugin for Roundcube
 
-This plugin allows users to switch between different accounts (including remote) in single Roundcube session.
+This plugin allows users to switch between different accounts (including remote) in single Roundcube session like this:
+
+![Screenshot example](https://i.imgur.com/rRIqtA8.jpg)
 
 *Inspired by identities_imap plugin that is no longer supported.*
 
 ### Where to start ###
-* In settigs interface create new identity.
-* For all identities except default you will see new section of settings - IMAP. Enter data required to connect to  remote server. Don't forget to check Enabled check box.
-* After you have created at least one identity with active IMAP settings you will see combobox in the top right corner instead of plain text field with account name. It will allows you to switch to another account.
+* In settings interface create new identity.
+* For all identities except default you will see new section of settings - "Plugin ident_switch" (see screenshot below). Enter data required to connect to  remote server. Don't forget to check Enabled check box.
+* After you have created at least one identity with active plugin you will see combobox in the top right corner instead of plain text field with account name. It will allows you to switch to another account.
+
+### Settings ###
+
+![Plugin settings](https://i.imgur.com/rFaHUbR.jpg)
+
+* **Enabled** - enables plugin (i.e. account switcing) for this identity.
+* **Label** - text that will be displayed in drop down list for this identity. If left blank email will be used.
+* **IMAP**
+    * **Server host name** - host name for imap server. If left blank 'localhost' will be used.
+    * **Port** - port on server to connect to. If left blank 143 will be used.
+    * **Secure connection** - enabled secure connection (TLS) *for both IMAP and SMTP*.
+    * **Username** - login used *for IMAP and SMTP servers*.
+    * **Password** - password used *for IMAP and SMTP servers*. It's stored encrypted in database.
+* **SMTP**
+    * **Server host name** - host name for imap server. If left blank 'localhost' will be used.
+    * **Port** - port on server to connect to. If left blank 587 will be used.
+
+### Version compatibility ###
+* Versions 1.X (not supported any more) - for Roundcube v1.1
+* Versions 2.X (not supported any more) - for Roundcube v1.2
+* Versions 3.X (not supported any more) - for Roundcube v1.3
+* Versions 4.x - for Roundcube v1.3 and upcoming 1.4.
+
+Please specify version like "~2.0" in your composer.json file for ident_switch requirement. In this case you will stay inside compatible branch until you manually update your Roundcube installation.

SQL/mysql.initial.sql

@@ -11,23 +11,25 @@ CREATE TABLE IF NOT EXISTS ident_switch
 		int(10) UNSIGNED
 		NOT NULL,
 	username
-		varchar(64)
-		NOT NULL,
+		varchar(64),
 	password
 		varchar(64),
-	host
+	imap_host
 		varchar(64),
-	port
+	imap_port
 		int
 		CHECK(port > 0 AND port <= 65535),
-	delimiter
-		char(1),
 	label
 		varchar(32),
 	flags
 		int
 		NOT NULL
 		DEFAULT 0,
+  smtp_host
+    varchar(64),
+  smtp_port
+    int
+    CHECK(port > 0 AND port <= 65535),
 	UNIQUE KEY user_id_label (user_id, label),
 	CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
 	CONSTRAINT fk_identity_id FOREIGN KEY (iid) REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE,

SQL/mysql/2018071600.sql

@@ -0,0 +1,6 @@
+ALTER TABLE
+	ident_switch
+MODIFY
+	username
+	varchar(64)
+	NULL;

SQL/mysql/2018121800.sql

@@ -0,0 +1,29 @@
+ALTER TABLE
+  ident_switch
+CHANGE
+  host
+  imap_host varchar(64);
+
+ALTER TABLE
+  ident_switch
+CHANGE
+  port
+  imap_port int;
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	smtp_host
+    varchar(64);
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+  smtp_port
+		int
+		CHECK(smtp_port > 0 AND smtp_port <= 65535);
+
+ALTER TABLE
+  ident_switch
+DROP COLUMN
+  delimiter;

SQL/postgres.initial.sql

@@ -13,23 +13,25 @@ CREATE TABLE ident_switch
 		REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
 		UNIQUE,
 	username
-		varchar(64)
-		NOT NULL,
+		varchar(64),
 	password
 		varchar(64),
-	host
+	imap_host
 		varchar(64),
-	port
+	imap_port
 		integer
 		CHECK(port > 0 AND port <= 65535),
-	delimiter
-		char(1),
 	label
 		varchar(32),
 	flags
 		integer
 		NOT NULL
 		DEFAULT(0),
+	smtp_host
+	  varchar(64),
+  smtp_port
+		integer
+		CHECK(port > 0 AND port <= 65535),
 	UNIQUE (user_id, label)
 );
 

SQL/postgres/2018081600.sql

@@ -0,0 +1,5 @@
+ALTER TABLE
+	ident_switch
+ALTER COLUMN
+	username
+DROP NOT NULL;

SQL/postgres/2018121800.sql

@@ -0,0 +1,31 @@
+ALTER TABLE
+  ident_switch
+RENAME COLUMN
+  host
+TO
+  imap_host;
+
+ALTER TABLE
+  ident_switch
+RENAME COLUMN
+  port
+TO
+  imap_port;
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	smtp_host
+    varchar(64);
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+  smtp_port
+		integer
+		CHECK(smtp_port > 0 AND smtp_port <= 65535);
+
+ALTER TABLE
+  ident_switch
+DROP COLUMN
+  delimiter;

SQL/sqlite.initial.sql

@@ -0,0 +1,38 @@
+CREATE TABLE ident_switch
+(
+	id
+		serial
+		PRIMARY KEY,
+	user_id
+		integer
+		NOT NULL
+		REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+	iid
+		integer
+		NOT NULL
+		REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
+		UNIQUE,
+	username
+		varchar(64),
+	password
+		varchar(64),
+	imap_host
+		varchar(64),
+	imap_port
+		integer
+		CHECK(imap_port > 0 AND imap_port <= 65535),
+	label
+		varchar(32),
+	flags
+		integer
+		NOT NULL
+		DEFAULT(0),
+  smtp_host
+    varchar(64),
+  smtp_port
+    integer
+    CHECK(smtp_port > 0 AND smtp_port <= 65535),
+	UNIQUE (user_id, label)
+);
+CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
+CREATE INDEX IX_ident_switch_iid on ident_switch(iid);

SQL/sqlite/2018121800.sql

@@ -0,0 +1,25 @@
+ALTER TABLE
+  ident_switch
+RENAME COLUMN
+  host
+TO
+  imap_host;
+
+ALTER TABLE
+  ident_switch
+RENAME COLUMN
+  port
+TO
+  imap_port;
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	smtp_host
+    varchar(64);
+
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+  smtp_port
+		int;

composer.json

@@ -19,8 +19,9 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
+      "php": ">=5.3.0",
+      "roundcube/plugin-installer": ">=0.1.3",
+      "ext-ctype": "*"
     },
 	"conflict": {
 		"elm/identity_smtp": "*"
@@ -30,7 +31,7 @@
 	},
 	"extra": {
 		"roundcube": {
-			"min-version": "1.1",
+			"min-version": "1.3",
 			"sql-dir": "SQL"
 		}
 	}

ident_switch-form.js

@@ -0,0 +1,35 @@
+/*
+ * This is part of identity_imap plugin
+ */
+
+$(function() {
+	$("INPUT[name='_ident_switch.form.common.enabled']").change();
+	plugin_switchIdent_processPreconfig();
+});
+
+function plugin_switchIdent_processPreconfig() {
+    var disFld = $("INPUT[name='_ident_switch.form.common.readonly']");
+    disFld.parentsUntil("TABLE", "TR").hide();
+
+    var disVal = disFld.val();
+    if (disVal > 0) {
+        $("INPUT[name='_ident_switch.form.imap.host']").prop("disabled", true);
+        $("SELECT[name='_ident_switch.form.imap.tls']").prop("disabled", true);
+        $("INPUT[name='_ident_switch.form.imap.port']").prop("disabled", true);
+
+        $("INPUT[name='_ident_switch.form.smtp.host']").prop("disabled", true);
+        $("SELECT[name='_ident_switch.form.smtp.tls']").prop("disabled", true);
+        $("INPUT[name='_ident_switch.form.smtp.port']").prop("disabled", true);
+    }
+    if (2 == disVal) {
+        $("INPUT[name='_ident_switch.form.imap.username']").prop("disabled", true);
+        $("INPUT[name='_ident_switch.form.smtp.username']").prop("disabled", true);
+    }
+
+}
+
+function plugin_switchIdent_enabled_onChange(e) {
+    var $enFld = $("INPUT[name='_ident_switch.form.common.enabled'], INPUT[name='_ident_switch.form.imap.host'], INPUT[name='_ident_switch.form.smtp.host']");
+    $("INPUT[name!='_ident_switch.form.common.enabled']", $enFld.parents("FIELDSET")).prop("disabled", !$enFld.is(":checked"));
+    plugin_switchIdent_processPreconfig();
+}

ident_switch-form.min.js

@@ -0,0 +1 @@
+$(function(){$("INPUT[name='_ident_switch.form.common.enabled']").change();plugin_switchIdent_processPreconfig()});function plugin_switchIdent_processPreconfig(){var a=$("INPUT[name='_ident_switch.form.common.readonly']");a.parentsUntil("TABLE","TR").hide();var b=a.val();if(b>0){$("INPUT[name='_ident_switch.form.imap.host']").prop("disabled",true);$("SELECT[name='_ident_switch.form.imap.tls']").prop("disabled",true);$("INPUT[name='_ident_switch.form.imap.port']").prop("disabled",true);$("INPUT[name='_ident_switch.form.smtp.host']").prop("disabled",true);$("SELECT[name='_ident_switch.form.smtp.tls']").prop("disabled",true);$("INPUT[name='_ident_switch.form.smtp.port']").prop("disabled",true)}if(2==b){$("INPUT[name='_ident_switch.form.imap.username']").prop("disabled",true);$("INPUT[name='_ident_switch.form.smtp.username']").prop("disabled",true)}}function plugin_switchIdent_enabled_onChange(a){var b=$("INPUT[name='_ident_switch.form.common.enabled'], INPUT[name='_ident_switch.form.imap.host'], INPUT[name='_ident_switch.form.smtp.host']");$("INPUT[name!='_ident_switch.form.common.enabled']",b.parents("FIELDSET")).prop("disabled",!b.is(":checked"));plugin_switchIdent_processPreconfig()};

ident_switch-switch.js

@@ -0,0 +1,71 @@
+/*
+ * This is part of identity_imap plugin
+ */
+
+$(function() {
+	$sw = $('#plugin-ident_switch-account');
+	isOk = false;
+
+	switch (rcmail.env['skin']) {
+		case 'larry':
+			isOk = plugin_switchIdent_addCbLarry($sw);
+			break;
+		case 'classic':
+			isOk = plugin_switchIdent_addCbClassic($sw);
+			break;
+        case 'elastic':
+            isOk = plugin_switchIdent_addCbElastic($sw);
+            break;
+	}
+
+	if (isOk)
+        $sw.show();
+});
+
+function plugin_switchIdent_addCbLarry($sw) {
+	var $truName = $('.topright .username');
+	if ($truName.length > 0) {
+		if ($sw.length > 0) {
+			$sw.prependTo('.topright');
+			$truName.hide();
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+function plugin_switchIdent_addCbClassic($sw) {
+	var $taskBar = $('#taskbar');
+	if ($taskBar.length > 0) {
+		$taskBar.prepend($sw);
+		return true;
+	}
+
+	return false;
+}
+
+function plugin_switchIdent_addCbElastic($sw) {
+    var $taskBar = $('.header-title.username');
+    $sw.css("background-color", "transparent").css("border","none");
+    $sw.css("background-position-x","left 0.75rem").css("padding","0 0 0 2rem");
+    $sw.css("font-weight","bold").css("box-shadow","none");
+    if ($taskBar.length > 0) {
+        $taskBar.prepend($sw);
+        return true;
+    }
+
+    return false;
+}
+
+function plugin_switchIdent_switch(val) {
+    rcmail.env.unread_counts = {};
+    console.log(rcmail.env.unread_counts);
+	rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val, '_mbox': rcmail.env.mailbox });
+}
+
+function  plugin_switchIdent_fixIdent(iid) {
+	if (parseInt(iid) > 0)
+		$("#_from").val(iid);
+}

ident_switch-switch.min.js

@@ -0,0 +1 @@
+$(function(){$sw=$("#plugin-ident_switch-account");isOk=false;switch(rcmail.env.skin){case"larry":isOk=plugin_switchIdent_addCbLarry($sw);break;case"classic":isOk=plugin_switchIdent_addCbClassic($sw);break;case"elastic":isOk=plugin_switchIdent_addCbElastic($sw);break}if(isOk){$sw.show()}});function plugin_switchIdent_addCbLarry(b){var a=$(".topright .username");if(a.length>0){if(b.length>0){b.prependTo(".topright");a.hide();return true}}return false}function plugin_switchIdent_addCbClassic(b){var a=$("#taskbar");if(a.length>0){a.prepend(b);return true}return false}function plugin_switchIdent_addCbElastic(b){var a=$(".header-title.username");b.css("background-color","transparent").css("border","none");b.css("background-position-x","left 0.75rem").css("padding","0 0 0 2rem");b.css("font-weight","bold").css("box-shadow","none");if(a.length>0){a.prepend(b);return true}return false}function plugin_switchIdent_switch(a){rcmail.env.unread_counts={};console.log(rcmail.env.unread_counts);rcmail.http_post("plugin.ident_switch.switch",{"_ident-id":a,_mbox:rcmail.env.mailbox})}function plugin_switchIdent_fixIdent(a){if(parseInt(a)>0){$("#_from").val(a)}};

ident_switch.js

@@ -1,61 +0,0 @@
-/*
- * This is part of identity_imap plugin
- */
-
-$(function() {
-	var $truName = $('.topright .username');
-	if ($truName.size() > 0) {
-		$sw = $('#plugin-ident_switch-account');
-		if ($sw.size() > 0) {
-			$sw.prependTo('.topright');
-			$truName.hide();
-			$('#plugin-ident_switch-account').show();
-		}
-	}
-
-	$("INPUT[name='_ident_switch.form.enabled']").change();
-	$("SELECT[name='_ident_switch.form.secure']").change();
-
-	plugin_switchIdent_processPreconfig();
-});
-
-function plugin_switchIdent_processPreconfig() {
-	var disFld = $("INPUT[name='_ident_switch.form.readonly']");
-	disFld.parentsUntil("TABLE", "TR").hide();
-
-	var disVal = disFld.val();
-	if (disVal > 0) {
-		$("INPUT[name='_ident_switch.form.host']").prop("disabled", true);
-		$("SELECT[name='_ident_switch.form.secure']").prop("disabled", true);
-		$("INPUT[name='_ident_switch.form.port']").prop("disabled", true);
-	}
-	if (2 == disVal) {
-		$("INPUT[name='_ident_switch.form.username']").prop("disabled", true);
-	}
-
-}
-
-function plugin_switchIdent_enabled_onChange(e) {
-	var $enFld = $("INPUT[name='_ident_switch.form.enabled']");
-	$("INPUT[name!='_ident_switch.form.enabled'], SELECT", $enFld.parents("FIELDSET")).prop("disabled", !$enFld.is(":checked"));
-	plugin_switchIdent_processPreconfig();
-}
-
-function plugin_switchIdent_secure_onChange(e) {
-	var $secSel = $("SELECT[name='_ident_switch.form.secure']");
-	var $portFld = $("INPUT[name='_ident_switch.form.port']");
-
-	if ('SSL' === $secSel.val().toUpperCase())
-		$portFld.attr("placeholder", 993);
-	else
-		$portFld.attr("placeholder", 143);
-}
-
-function plugin_switchIdent_switch(val) {
-	rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val, '_mbox': rcmail.env.mailbox });
-}
-
-function  plugin_switchIdent_fixIdent(iid) {
-	if (parseInt(iid) > 0)
-		$("#_from").val(iid);
-}

ident_switch.min.js

@@ -1,10 +0,0 @@
-$(function(){var $truName=$('.topright .username');if($truName.size()>0){$sw=$('#plugin-ident_switch-account');if($sw.size()>0){$sw.prependTo('.topright');$truName.hide();$('#plugin-ident_switch-account').show();}}
-$("INPUT[name='_ident_switch.form.enabled']").change();$("SELECT[name='_ident_switch.form.secure']").change();plugin_switchIdent_processPreconfig();});function plugin_switchIdent_processPreconfig(){var disFld=$("INPUT[name='_ident_switch.form.readonly']");disFld.parentsUntil("TABLE","TR").hide();var disVal=disFld.val();if(disVal>0){$("INPUT[name='_ident_switch.form.host']").prop("disabled",true);$("SELECT[name='_ident_switch.form.secure']").prop("disabled",true);$("INPUT[name='_ident_switch.form.port']").prop("disabled",true);}
-if(2==disVal){$("INPUT[name='_ident_switch.form.username']").prop("disabled",true);}}
-function plugin_switchIdent_enabled_onChange(e){var $enFld=$("INPUT[name='_ident_switch.form.enabled']");$("INPUT[name!='_ident_switch.form.enabled'], SELECT",$enFld.parents("FIELDSET")).prop("disabled",!$enFld.is(":checked"));plugin_switchIdent_processPreconfig();}
-function plugin_switchIdent_secure_onChange(e){var $secSel=$("SELECT[name='_ident_switch.form.secure']");var $portFld=$("INPUT[name='_ident_switch.form.port']");if('SSL'===$secSel.val().toUpperCase())
-$portFld.attr("placeholder",993);else
-$portFld.attr("placeholder",143);}
-function plugin_switchIdent_switch(val){rcmail.http_post('plugin.ident_switch.switch',{'_ident-id':val,'_mbox':rcmail.env.mailbox});}
-function plugin_switchIdent_fixIdent(iid){if(parseInt(iid)>0)
-$("#_from").val(iid);}

ident_switch.php

@@ -12,14 +12,13 @@ class ident_switch extends rcube_plugin
 {
 	public $task='?(?!login|logout).*';
 
-	private $table = 'ident_switch';
-	private $my_postfix = '_iswitch';
-	private $my_log = 'ident_switch';
+	const TABLE = 'ident_switch';
+	const MY_POSTFIX = '_iswitch';
 
 	// Flags user in database
-	private $db_enabled		= 1;
-	private $db_secure_ssl	= 2;
-	private $db_secure_tls	= 4;
+	const DB_ENABLED		    = 1;
+	//const DB_SECURE_SSL		= 2; // Not supported any more
+	const DB_SECURE_IMAP_TLS	= 4;
 
 	function init()
 	{
@@ -28,6 +27,8 @@ class ident_switch extends rcube_plugin
 		$this->add_hook('smtp_connect', array($this, 'on_smtp_connect'));
 		$this->add_hook('identity_form', array($this, 'on_identity_form'));
 		$this->add_hook('identity_update', array($this, 'on_identity_update'));
+		$this->add_hook('identity_create', array($this, 'on_identity_create'));
+		$this->add_hook('identity_create_after', array($this, 'on_identity_create_after'));
 		$this->add_hook('identity_delete', array($this, 'on_identity_delete'));
 		$this->add_hook('template_object_composeheaders', array($this, 'on_template_object_composeheaders'));
 
@@ -57,25 +58,41 @@ class ident_switch extends rcube_plugin
 	{
 		$rc = rcmail::get_instance();
 
-		// Currently selected identity
-		$iid = $_SESSION['iid' . $this->my_postfix];
+		switch ($rc->task)
+		{
+		case 'mail':
+			$this->render_switch($rc, $args);
+			break;
+		case 'settings':
+			$this->include_script('ident_switch-form.js');
+			break;
+		}
 
-		$iid_int = 0;
-		if (is_int($iid))
-			$iid_int = $iid;
-		elseif ($iid === '-1')
-			$iid_int = -1;
-		elseif (ctype_digit($iid))
-			$iid_int = intval($iid);
+
+		return $args;
+	}
+
+	private function render_switch($rc, $args)
+	{
+		// Currently selected identity
+		$iid_s = $_SESSION['iid' . self::MY_POSTFIX];
+
+		$iid = 0;
+		if (is_int($iid_s))
+			$iid = $iid_s;
+		elseif ($iid_s === '-1')
+			$iid = -1;
+		elseif (ctype_digit($iid_s))
+			$iid = intval($iid_s);
 
 		// Get list of alternative accounts
 		$sOpt = '';
-		$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0';
-		$qRec = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled);
+		$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE user_id = ? AND flags & ? > 0';
+		$qRec = $rc->db->query($sql, $rc->user->data['user_id'], self::DB_ENABLED);
 		while ($r = $rc->db->fetch_assoc($qRec))
 		{
 			$opts = array('value' => $r['id']);
-			if ($iid_int == $r['iid'])
+			if ($iid == $r['iid'])
 				$opts['selected'] = 'selected';
 
 			// Make label
@@ -109,7 +126,7 @@ class ident_switch extends rcube_plugin
 		{
 			// Add main account
 			$opts = array('value' => -1);
-			if (!$iid || $iid_int == -1)
+			if ($iid <= 0)
 				$opts['selected'] = 'selected';
 
 			$sOpt = html::tag(
@@ -118,7 +135,7 @@ class ident_switch extends rcube_plugin
 				$_SESSION['global_alias'] ? $_SESSION['global_alias'] : $rc->user->data['username']
 			) . $sOpt;
 
-			$this->include_script('ident_switch.js');
+			$this->include_script('ident_switch-switch.js');
 			$sw = html::tag(
 				'select', 
 				array(
@@ -130,27 +147,80 @@ class ident_switch extends rcube_plugin
 			);
 			$rc->output->add_footer($sw);
 		}
-
-		return $args;
 	}
 
 	function on_smtp_connect($args)
 	{
+		$iid = $_SESSION['iid' . self::MY_POSTFIX];
+		if (!is_integer($iid) || $iid == -1)
+			return $args;
+
 		$rc = rcmail::get_instance();
 
-		// TODO: Rewrite with full settings!
-
-		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0)
+		$sql = 'SELECT smtp_host, flags, smtp_port, username, password FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
+		$q = $rc->db->query($sql, $iid ,$rc->user->ID);
+		$r = $rc->db->fetch_assoc($q);
+		if (is_array($r))
 		{
-			if ($args['smtp_user'] == '%u')
-				$args['smtp_user'] = $rc->user->data['username'];
-			if ($args['smtp_pass'] == '%p')
-				$args['smtp_pass'] = $rc->decrypt($_SESSION['password' . $this->my_postfix]);
+			if (!$r['username'])
+			{ // Load email from identity
+				$sql = 'SELECT email FROM ' . $rc->db->table_name('identities') . ' WHERE identity_id = ?';
+				$q = $rc->db->query($sql, $iid);
+				$rIid = $rc->db->fetch_assoc($q);
+
+				$r['username'] = $rIid['email'];
+			}
+
+			$args['smtp_user'] = $r['username'];
+			$args['smtp_pass'] = $rc->decrypt($r['password']);
+			$args['smtp_server'] = $r['smtp_host'] ? $r['smtp_host'] : 'localhost'; // Default SMTP host here
+			$args['smtp_port'] = $r['smtp_port'] ? $r['smtp_port'] : 587; // Default SMTP port here
+
+			if ($r['flags'] & self::DB_SECURE_IMAP_TLS)
+			{
+				if (strpos($args['smtp_server'], ':') !== false)
+					self::write_log('SMTP server already contains protocol, ignoring TLS flag.');
+				else
+					$args['smtp_server'] = 'tls://' . $args['smtp_server'];
+			}
+
+			self::write_log(print_r($args, true));
 		}
 
 		return $args;
 	}
 
+	private static function get_common_form(&$record)
+	{
+		$prefix = 'ident_switch.form.common.';
+		return array(
+			$prefix . 'enabled' => array('type' => 'checkbox', 'onchange' => 'plugin_switchIdent_enabled_onChange();'),
+			$prefix . 'label' => array('type' => 'text', 'size' => 32, 'placeholder' => $record['email']),
+			$prefix . 'readonly' => array('type' => 'hidden'),
+		);
+	}
+
+	private static function get_imap_form(&$record)
+	{
+		$prefix = 'ident_switch.form.imap.';
+		return array(
+			$prefix . 'host' => array('type' => 'text', 'size' => 64, 'placeholder' => 'localhost'),
+			$prefix . 'port' => array('type' => 'text', 'size' => 5, 'placeholder' => 143),
+			$prefix . 'tls' => array('type' => 'checkbox'),
+			$prefix . 'username' => array('type' => 'text', 'size' => 64, 'placeholder' => $record['email']),
+			$prefix . 'password' => array('type' => 'password', 'size' => 64),
+		);
+	}
+
+	private static function get_smtp_form(&$record)
+	{
+		$prefix = 'ident_switch.form.smtp.';
+		return array(
+			$prefix . 'host' => array('type' => 'text', 'size' => 64, 'placeholder' => 'localhost'),
+			$prefix . 'port' => array('type' => 'text', 'size' => 5, 'placeholder' => 587),
+		);
+	}
+
 	function on_identity_form($args)
 	{
 		$rc = rcmail::get_instance();
@@ -161,58 +231,61 @@ class ident_switch extends rcube_plugin
 
 		$this->add_texts('localization');
 
-		// Create our field set
-		$args['form']['ident_switch'] = array(
-			'name' => $this->gettext('form.caption'),
-			'content' => array(
-				'ident_switch.form.enabled' => array('type' => 'checkbox', 'onchange' => 'plugin_switchIdent_enabled_onChange();'),
-				'ident_switch.form.label' => array('type' => 'text', 'size' => 32, 'placeholder' => $args['record']['email']),
-				'ident_switch.form.host' => array('type' => 'text', 'size' => 64, 'placeholder' => 'localhost'),
-				'ident_switch.form.secure' => array(
-					'type' => 'select', 
-					'options' => array('ssl' => 'SSL', 'tls' => 'TLS'), 
-					'onchange' => 'plugin_switchIdent_secure_onChange();'
-				),
-				'ident_switch.form.port' => array('type' => 'text', 'size' => 5),
-				'ident_switch.form.username' => array('type' => 'text', 'size' => 64, 'placeholder' => $args['record']['email']),
-				'ident_switch.form.password' => array('type' => 'password', 'size' => 64),
-				'ident_switch.form.delimiter' => array('type' => 'text', 'size' => 1, 'placeholder' => '.'),
-				'ident_switch.form.readonly' => array('type' => 'hidden'),
-			),
-		);
-
-		// Load data if exists
+		$row = null;
 		if (isset($args['record']['identity_id']))
 		{
-			$sql = 'SELECT * FROM ' . $rc->db->table_name($this->table) . ' WHERE iid = ? AND user_id = ?';
+			$sql = 'SELECT * FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
 			$q = $rc->db->query($sql, $args['record']['identity_id'], $rc->user->ID);
-			$r = $rc->db->fetch_assoc($q);
-			if ($r)
-			{
-				foreach ($r as $k => $v)
-					$args['record']['ident_switch.form.' . $k] = $v;
-
-				// Parse flags
-				if ($r['flags'] & $this->db_enabled)
-					$args['record']['ident_switch.form.enabled'] = true;
-				if ($r['flags'] & $this->db_secure_tls) // TLS has priority
-					$args['record']['ident_switch.form.secure'] = 'tls';
-				elseif ($r['flags'] & $this->db_secure_ssl)
-					$args['record']['ident_switch.form.secure'] = 'ssl';
-
-				// Set readonly if needed
-				$cfg = $this->get_preconfig($args['record']['email']);
-				if (is_array($cfg) && $cfg['readonly'])
-				{
-					$args['record']['ident_switch.form.readonly'] = 1;
-					if (in_array(strtoupper($cfg['user']), array('EMAIL', 'MBOX')))
-						$args['record']['ident_switch.form.readonly'] = 2;
-				}
-			}
-			else
-				$this->apply_preconfig($args['record']);
+			$row = $rc->db->fetch_assoc($q);
 		}
 
+		$record = &$args['record'];
+
+		// Load data if exists
+		if ($row)
+		{
+			$dbToForm = array(
+				'label' => 'common.label',
+				'imap_host' => 'imap.host',
+				'imap_port' => 'imap.port',
+				'username' => 'imap.username',
+				'password' => 'imap.password',
+				'smtp_host' => 'smtp.host',
+				'smtp_port' => 'smtp.port'
+
+			);
+			foreach ($row as $k => $v)
+				$record['ident_switch.form.' . $dbToForm[$k]] = $v;
+
+			// Parse flags
+			$record['ident_switch.form.common.enabled'] = !!($row['flags'] & self::DB_ENABLED);
+			$record['ident_switch.form.imap.tls'] = !!($row['flags'] & self::DB_SECURE_IMAP_TLS);
+
+			// Set readonly if needed
+			$cfg = $this->get_preconfig($record['email']);
+			if (is_array($cfg) && $cfg['readonly'])
+			{
+				$record['ident_switch.form.common.readonly'] = 1;
+				if (in_array(strtoupper($cfg['user']), array('EMAIL', 'MBOX')))
+					$record['ident_switch.form.common.readonly'] = 2;
+			}
+		}
+		else
+			$this->apply_preconfig($record);
+
+		$args['form']['ident_switch.common'] = array(
+			'name' => $this->gettext('form.common.caption'),
+			'content' => ident_switch::get_common_form($record)
+		);
+		$args['form']['ident_switch.imap'] = array(
+			'name' => $this->gettext('form.imap.caption'),
+			'content' => ident_switch::get_imap_form($record)
+		);
+		$args['form']['ident_switch.smtp'] = array(
+			'name' => $this->gettext('form.smtp.caption'),
+			'content' => ident_switch::get_smtp_form($record)
+		);
+
 		return $args;
 	}
 
@@ -224,105 +297,69 @@ class ident_switch extends rcube_plugin
 		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
 			return $args;
 
-		// Process boolean fields
-		$flags = 0;
-		if (rcube_utils::get_input_value('_ident_switch_form_enabled', rcube_utils::INPUT_POST))
-			$flags |= $this->db_enabled;
-
-		if (!($flags & $this->db_enabled))
+		if (!self::get_field_value('common', 'enabled', false))
 		{
-			$this->sw_imap_off($args['iid']);
+			self::sw_imap_off($args['id']);
 			return $args;
 		}
 
-		// Check field values
-		$errMsg = '';
-
-		$fLabel = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_label', rcube_utils::INPUT_POST));
-		if (strlen($fLabel) > 32)
-			$errMsg = 'label.long';
-		else
-		{
-			$fHost = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_host', rcube_utils::INPUT_POST));
-			if (strlen($fHost) > 64)
-				$errMsg = 'host.long';
-			else
-			{
-				$fPort = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_port', rcube_utils::INPUT_POST));
-				if ($fPort && !ctype_digit($fPort))
-					$errMsg = 'port.num';
-				else
-				{
-					if ($fPort && ($fPort <= 0 || $fPort > 65535))
-						$errMsg = 'port.range';
-					else
-					{
-						$fUser = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_username', rcube_utils::INPUT_POST));
-						if (strlen($fUser) > 64)
-							$errMsg = 'user.long';
-						else
-						{
-							$fDelim = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_delimiter', rcube_utils::INPUT_POST));
-							if (strlen($fDelim) > 1)
-								$errMsg = 'delim.long';
-						}
-					}
-				}
-			}
-		}
-
-		if ($errMsg)
+		$data = self::check_field_values();
+		if ($data['err'])
 		{
 			$this->add_texts('localization');
-			$rc->output->show_message('ident_switch.err.' . $errMsg, 'error');
 			$args['abort'] = true;
+			$args['message'] = 'ident_switch.err.' . $data['err'];
 			return $args;
 		}
 
-		// Parse secure settings
-		$ssl = rcube_utils::get_input_value('_ident_switch_form_secure', rcube_utils::INPUT_POST);
-		if (strcasecmp($ssl, 'tls') === 0)
-			$flags |= $this->db_secure_tls;
-		elseif (strcasecmp($ssl, 'ssl') === 0)
-			$flags |= $this->db_secure_ssl;
+		$data['id'] = $args['id'];
+		self::save_field_values($rc, $data);
 
-		$sql = 'SELECT id, password FROM ' . $rc->db->table_name($this->table) . ' WHERE iid = ? AND user_id = ?';
-		$q = $rc->db->query($sql, $args['id'], $rc->user->ID);
-		$r = $rc->db->fetch_assoc($q);
-		if ($r)
-		{ // Record already exists, will update it
-			$sql = 'UPDATE ' .
-				$rc->db->table_name($this->table) .
-				' SET flags = ?, label = ?, host = ?, port = ?, username = ?, password = ?, delimiter = ?, user_id = ?, iid = ?' .
-				' WHERE id = ?';
-		}
-		else if ($flags & $this->db_enabled)
-		{ // No record exists, create new one
-			$sql = 'INSERT INTO ' .
-				$rc->db->table_name($this->table) .
-				'(flags, label, host, port, username, password, delimiter, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
-		}
+		return $args;
+	}
 
-		if ($sql)
+	function on_identity_create($args)
+	{
+		$rc = rcmail::get_instance();
+
+		// Do not do anything for default identity
+		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
+			return $args;
+
+		if (!self::get_field_value('common', 'enabled', false))
+				return $args;
+
+		$data = self::check_field_values();
+		if ($data['err'])
 		{
-			// Do we need to update pwd?
-			$fPass = rcube_utils::get_input_value('_ident_switch_form_password', rcube_utils::INPUT_POST);
-			if ($fPass != $r['password'])
-				$fPass = $rc->encrypt($fPass);
+			$this->add_texts('localization');
+			$args['abort'] = true;
+			$args['message'] = 'ident_switch.err.' . $data['err'];
+		}
 
-			$rc->db->query(
-				$sql,
-				$flags,
-				$fLabel,
-				$fHost,
-				$fPort,
-				$fUser,
-				$fPass,
-				$fDelim,
-				$rc->user->ID,
-				$args['id'],
-				$r['id']
-			);
+		// Save data for _after (cannot pass with $args)
+		$_SESSION['createData' . self::MY_POSTFIX] = $data;
+
+		return $args;
+	}
+
+	function on_identity_create_after($args)
+	{
+		$rc = rcmail::get_instance();
+
+		// Do not do anything for default identity
+		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
+			return $args;
+
+		$data = $_SESSION['createData' . self::MY_POSTFIX];
+
+		unset($_SESSION['createData' . self::MY_POSTFIX]);
+		if (!$data || count($data) == 0)
+			self::write_log('Object with ident_switch values not found in session for ID = ' . $args['id'] . '.');
+		else
+		{
+			$data['id'] = $args['id'];
+			self::save_field_values($rc, $data);
 		}
 
 		return $args;
@@ -332,11 +369,11 @@ class ident_switch extends rcube_plugin
 	{
 		$rc = rcmail::get_instance();
 
-		$sql = 'DELETE FROM ' . $rc->db->table_name($this->table) . ' WHERE iid = ? AND user_id = ?';
+		$sql = 'DELETE FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
 		$q = $rc->db->query($sql, $args['id'], $rc->user->ID);
 
 		if ($rc->db->affected_rows($q))
-			$rc->write_log($this->my_log, 'Deleted associated information for identity with ID = ' . $args['id'] . '.');
+			self::write_log('Deleted associated information for identity with ID = ' . $args['id'] . '.');
 
 		return $args;
 	}
@@ -348,29 +385,149 @@ class ident_switch extends rcube_plugin
 			$rc = rcmail::get_instance();
 			if (strcasecmp($_SESSION['username'], $rc->user->data['username']) !== 0)
 			{
-				if (isset($_SESSION['iid' . $this->my_postfix]))
-					$rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . $this->my_postfix] . ');', 'docready');
+				if (isset($_SESSION['iid' . self::MY_POSTFIX]))
+					$rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . self::MY_POSTFIX] . ');', 'docready');
 				else
-					$rc->write_log($this->my_log, 'Special session variable with active identity ID not found.');
+					self::write_log('Special session variable with active identity ID not found.');
 			}
 		}
 	}
 
+
+	private static function check_field_values()
+	{
+		$retVal = array();
+
+		$retVal['label'] = self::get_field_value('common', 'label');
+		if (strlen($retVal['label']) > 32)
+			$retVal['err'] = 'label.long';
+		else
+		{
+			$retVal['imap.host'] = self::get_field_value('imap', 'host');
+			if (strlen($retVal['imap.host']) > 64)
+				$retVal['err'] = 'host.long';
+			else
+			{
+				$retVal['imap.port'] = self::get_field_value('imap', 'port');
+				if ($retVal['imap.port'] && !ctype_digit($retVal['imap.port']))
+					$retVal['err'] = 'port.num';
+				else
+				{
+					if ($retVal['imap.port'] && ($retVal['imap.port'] <= 0 || $retVal['imap.port'] > 65535))
+						$retVal['err'] = 'port.range';
+					else
+					{
+						$retVal['imap.user'] = self::get_field_value('imap', 'username');
+						if (strlen($retVal['imap.user']) > 64)
+							$retVal['err'] = 'user.long';
+						else
+						{
+							$retVal['smtp.host'] = self::get_field_value('smtp', 'host');
+							if (strlen($retVal['smtp.host']) > 64)
+								$retVal['err'] = 'host.long';
+							else
+							{
+								$retVal['smtp.port'] = self::get_field_value('smtp', 'port');
+								if ($retVal['smtp.port'] && !ctype_digit($retVal['smtp.port']))
+									$retVal['err'] = 'port.num';
+								else
+								{
+									if ($retVal['smtp.port'] && ($retVal['smtp.port'] <= 0 || $retVal['smtp.port'] > 65535))
+										$retVal['err'] = 'port.range';
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Get also password
+		$retVal['imap.pass'] = self::get_field_value('imap', 'password', false);
+
+		// Parse secure settings
+		$retVal['flags'] = self::DB_ENABLED;
+
+		$tls = self::get_field_value('imap', 'tls', false);
+		if ($tls)
+			$retVal['flags'] |= self::DB_SECURE_IMAP_TLS;
+
+		return $retVal;
+	}
+
+	private static function get_field_value($section, $field, $trim = true)
+	{
+		$retVal = rcube_utils::get_input_value(
+			'_ident_switch_form_' . $section . '_' . $field,
+			rcube_utils::INPUT_POST
+		);
+		if (!$trim)
+			return $retVal;
+
+		return self::ntrim($retVal);
+	}
+
+	private static function save_field_values($rc, $data)
+	{
+		$sql = 'SELECT id, password FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
+		$q = $rc->db->query($sql, $data['id'], $rc->user->ID);
+		$r = $rc->db->fetch_assoc($q);
+		if ($r)
+		{ // Record already exists, will update it
+			$sql = 'UPDATE ' .
+				$rc->db->table_name(self::TABLE) .
+				' SET flags = ?, label = ?, imap_host = ?, imap_port = ?, username = ?, password = ?, smtp_host = ?, smtp_port = ?, user_id = ?, iid = ?' .
+				' WHERE id = ?';
+		}
+		else if ($data['flags'] & self::DB_ENABLED)
+		{ // No record exists, create new one
+			$sql = 'INSERT INTO ' .
+				$rc->db->table_name(self::TABLE) .
+				'(flags, label, imap_host, imap_port, username, password, smtp_host, smtp_port, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+		}
+
+		if ($sql)
+		{
+			// Do we need to update pwd?
+			if ($data['imap.pass'] != $r['password'])
+				$data['imap.pass'] = $rc->encrypt($data['imap.pass']);
+
+			$rc->db->query(
+				$sql,
+				$data['flags'],
+				$data['label'],
+				$data['imap.host'],
+				$data['imap.port'],
+				$data['imap.user'],
+				$data['imap.pass'],
+				$data['smtp.host'],
+				$data['smtp.port'],
+				$rc->user->ID,
+				$data['id'],
+				$r['id']
+			);
+
+			return true;
+		}
+
+		return false;
+	}
+
 	function on_switch()
 	{
 		$rc = rcmail::get_instance();
 
-		$my_postfix_len = strlen($this->my_postfix);
+		$my_postfix_len = strlen(self::MY_POSTFIX);
 		$identId = rcube_utils::get_input_value('_ident-id', rcube_utils::INPUT_POST);
 
 		if (-1 == $identId)
 		{ // Switch to main account
-			$rc->write_log($this->my_log, 'Switching mailbox back to default.');
+			self::write_log('Switching mailbox back to default.');
 
 			// Restore everything with STORAGE*my_postfix
 			foreach ($_SESSION as $k => $v)
 			{
-				if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $this->my_postfix, -$my_postfix_len, $my_postfix_len) === 0)
+				if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, self::MY_POSTFIX, -$my_postfix_len, $my_postfix_len) === 0)
 				{
 					$realKey = substr($k, 0, -$my_postfix_len);
 					$_SESSION[$realKey] = $_SESSION[$k];
@@ -378,12 +535,12 @@ class ident_switch extends rcube_plugin
 				}
 			}
 			$_SESSION['username'] = $rc->user->data['username'];
-			$_SESSION['password'] = $_SESSION['password' . $this->my_postfix];
-			$_SESSION['iid' . $this->my_postfix] = -1;
+			$_SESSION['password'] = $_SESSION['password' . self::MY_POSTFIX];
+			$_SESSION['iid' . self::MY_POSTFIX] = -1;
 		}
 		else
 		{
-			$sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name($this->table) . ' WHERE id = ? AND user_id = ?';
+			$sql = 'SELECT imap_host, flags, imap_port, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE id = ? AND user_id = ?';
 			$q = $rc->db->query($sql, $identId ,$rc->user->ID);
 			$r = $rc->db->fetch_assoc($q);
 			if (is_array($r))
@@ -397,27 +554,16 @@ class ident_switch extends rcube_plugin
 					$r['username'] = $rIid['email'];
 				}
 
-				$rc->write_log(
-					$this->my_log,
-					'Switching mailbox to one for identity with ID = ' . $r['iid'] . ' (username = \'' . $r['username'] . '\').'
-				);
+				self::write_log('Switching mailbox to one for identity with ID = ' . $r['iid'] . ' (username = \'' . $r['username'] . '\').');
 
-				$def_port = 143; // Default port here!
+				$def_port = 143; // Default IMAP port here!
 				$ssl = null;
-				if ($r['flags'] & $this->db_secure_tls)
+				if ($r['flags'] & self::DB_SECURE_IMAP_TLS)
 				{
 					$ssl = 'tls';
-					$def_port = 143; // Default TLS port here!
+					$def_port = 143; // Default IMAP TLS port here!
 				}
-				elseif ($r['flags'] & $this->db_secure_ssl)
-				{
-					$ssl = 'ssl';
-					$def_port = 993; // Default SSL port here!
-				}
-
-				$port = $r['port'];
-				if (!$port)
-					$port = $def_port;
+				$port = $r['imap_port'] ? $r['imap_port'] : $def_port;
 
 				// If we are in default account now
 				// save everything with STORAGE
@@ -425,30 +571,30 @@ class ident_switch extends rcube_plugin
 				{
 					foreach ($_SESSION as $k => $v)
 					{
-						if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $this->my_postfix, -$my_postfix_len, $my_postfix_len) !== 0)
+						if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, self::MY_POSTFIX, -$my_postfix_len, $my_postfix_len) !== 0)
 						{
-							if (!$_SESSION[$k . $this->my_postfix])
-								$_SESSION[$k . $this->my_postfix] = $_SESSION[$k];
+							if (!$_SESSION[$k . self::MY_POSTFIX])
+								$_SESSION[$k . self::MY_POSTFIX] = $_SESSION[$k];
                             $rc->session->remove($k);
 						}
 					}
 				}
-				if (!$_SESSION['password' . $this->my_postfix])
-					$_SESSION['password' . $this->my_postfix] = $_SESSION['password'];
+				if (!$_SESSION['password' . self::MY_POSTFIX])
+					$_SESSION['password' . self::MY_POSTFIX] = $_SESSION['password'];
 
-				$_SESSION['storage_host'] = $r['host'] ? $r['host'] : 'localhost'; // Default host here!
+				$_SESSION['storage_host'] = $r['imap_host'] ? $r['imap_host'] : 'localhost'; // Default IMAP host here!
 				$_SESSION['storage_ssl'] = $ssl;
 				$_SESSION['storage_port'] = $port;
 				$_SESSION['username'] = $r['username'];
 				$_SESSION['password'] = $r['password'];
-				$_SESSION['iid' . $this->my_postfix] = $r['iid'];
+				$_SESSION['iid' . self::MY_POSTFIX] = $r['iid'];
 
 				$rc->session->remove('folders');
 			}
 			else
 			{
 				// TODO: Show message in browser
-				$rc->write_log($this->my_log, 'Requested remote mailbox with ID = ' . $identId . ' not found.');
+				self::write_log('Requested remote mailbox with ID = ' . $identId . ' not found.');
 				return;
 			}
 		}
@@ -461,21 +607,20 @@ class ident_switch extends rcube_plugin
 		);
 	}
 
-	protected function sw_imap_off($iid)
+	private static function sw_imap_off($iid)
 	{
 		$rc = rcmail::get_instance();
 
-		$sql = 'UPDATE ' . $rc->db->table_name($this->table) . ' SET flags = flags & ? WHERE iid = ? AND user_id = ?';
-		$rc->db->query($sql, ~$this->db_enabled, $iid, $rc->user->ID);
+		$sql = 'UPDATE ' . $rc->db->table_name(self::TABLE) . ' SET flags = flags & ? WHERE iid = ? AND user_id = ?';
+		$rc->db->query($sql, ~self::DB_ENABLED, $iid, $rc->user->ID);
 	}
 
-	protected function get_preconfig($email)
+	private function get_preconfig($email)
 	{
 		$dom = substr(strstr($email, '@'), 1);
 		if (!$dom)
 			return false;
 
-		//$this->load_config('config.inc.php.dist'); Don't need it yet
 		$this->load_config(); // config.inc.php
 
 		$cfg = rcmail::get_instance()->config->get('ident_switch.preconfig', array());
@@ -489,30 +634,25 @@ class ident_switch extends rcube_plugin
 		return $cfg;
 	}
 
-	protected function apply_preconfig(&$record)
+	private function apply_preconfig(&$record)
 	{
 		$email = $record['email'];
 		$cfg = $this->get_preconfig($email);
 		if (is_array($cfg))
 		{
-			rcmail::get_instance()->write_log(
-				$this->my_log,
-				'Applying predefined configuration for \'' . $email . '\'.'
-			);
+			self::write_log('Applying predefined configuration for \'' . $email . '\'.');
 
 			if ($cfg['host'])
 			{ // Parse and set host and related
 				$urlArr = parse_url($cfg['host']);
 
-				$record['ident_switch.form.host'] = $urlArr['host'] ? rcube::Q($urlArr['host'], 'url') : '';
-				$record['ident_switch.form.port'] = $urlArr['port'] ? intval($urlArr['port']) : '';
+				$record['ident_switch.form.imap.host'] = $urlArr['host'] ? rcube::Q($urlArr['host'], 'url') : '';
+				$record['ident_switch.form.imap.port'] = $urlArr['port'] ? intval($urlArr['port']) : '';
 
 				if (strcasecmp('tls', $urlArr['scheme']) === 0)
-					$record['ident_switch.form.secure'] = 'tls';
-				elseif (strcasecmp('ssl', $urlArr['scheme']) === 0)
-					$record['ident_switch.form.secure'] = 'ssl';
+					$record['ident_switch.form.imap.tls'] = true;
 				else
-					$record['ident_switch.form.secure'] = '';
+					$record['ident_switch.form.imap.rls'] = false;
 			}
 
 			$loginSet = false;
@@ -521,11 +661,11 @@ class ident_switch extends rcube_plugin
 				switch (strtoupper($cfg['user']))
 				{
 				case 'EMAIL':
-					$record['ident_switch.form.username'] = $email;
+					$record['ident_switch.form.imap.username'] = $email;
 					$loginSet = true;
 					break;
 				case 'MBOX':
-					$record['ident_switch.form.username'] = strstr($email, '@', true);
+					$record['ident_switch.form.imap.username'] = strstr($email, '@', true);
 					$loginSet = true;
 					break;
 				}
@@ -533,16 +673,18 @@ class ident_switch extends rcube_plugin
 
 			if ($cfg['readonly'])
 			{
-				$record['ident_switch.form.readonly'] = 1;
+				$record['ident_switch.form.common.readonly'] = 1;
 				if ($loginSet)
-					$record['ident_switch.form.readonly'] = 2;
+					$record['ident_switch.form.common.readonly'] = 2;
 			}
 
 			return $cfg['readonly'];
 		}
+
+		return false;
 	}
 
-	protected static function ntrim($str)
+	private static function ntrim($str)
 	{
 		if (is_null($str))
 			return $str;
@@ -553,4 +695,9 @@ class ident_switch extends rcube_plugin
 
 		return $s;
 	}
+
+	private static function write_log($txt)
+	{
+		rcmail::get_instance()->write_log('ident_switch', $txt);
+	}
 }

localization/de_DE.inc

@@ -4,47 +4,64 @@
  */
 $labels = array();
 
-// IMAP
-$labels['form.caption'] = 'IMAP';
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
 
 // Enabled
-$labels['form.enabled'] = 'Aktiviert';
+$labels['form.common.enabled'] = 'Aktiviert';
 
 // Label
-$labels['form.label'] = 'Bezeichnung';
+$labels['form.common.label'] = 'Bezeichnung';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'Der Wert in Feld \'Bezeichnung\' ist zu lang (max. 32 Zeichen).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host']='Servername';
+$labels['form.imap.host'] = 'Servername';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure']='Verbindungssicherheit';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Sichere Verbindung (TLS)';
 
 // Port
-$labels['form.port']='Port';
+$labels['form.imap.port'] = 'Port';
 
 // Username
-$labels['form.username'] = 'Benutzername';
+$labels['form.imap.username'] = 'Benutzername';
 
 // Password
-$labels['form.password'] = 'Passwort';
+$labels['form.imap.password'] = 'Passwort';
 
-// Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Hierachietrennzeichen für Verzeichnisse';
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'Der Wert in Feld \'Benutzername\' ist zu lang (max. 64 Zeichen).';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = 'Der Wert in Feld \'Bezeichnung\' im Abschnitt IMAP ist zu lang (max. 32 Zeichen).';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = 'Der Wert in Feld \'Servername\' im Abschnitt IMAP ist zu lang (max. 64 Zeichen).';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = 'Der Wert in Feld \'Benutzername\' im Abschnitt IMAP ist zu lang (max. 64 Zeichen).';
+// Server host name
+$labels['form.smtp.host'] = 'Servername';
 
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = 'Der Wert in Feld \'Hierachietrennzeichen für Verzeichnisse\' im Abschnitt IMAP ist zu lang (max. 1 Zeichen).';
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Sichere Verbindung (TLS)';
 
-// Value in \'Port\' field of IMAP section must be a number.
-$labels['err.port.num'] = 'Der Wert in Feld \'Port\' im Abschnitt IMAP muss eine Zahl sein.';
+// Port
+$labels['form.smtp.port'] = 'Port';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = 'Der Wert in Feld \'Port\' im Abschnitt IMAP muss 1 und 65535 liegen.';
+// Authorization required
+$labels['form.smtp.auth'] = 'Genehmigung benötigt';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = 'Der Wert in Feld \'Servername\' ist zu lang (max. 64 Zeichen).';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = 'Der Wert in Feld \'Port\' muss eine Zahl sein.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = 'Der Wert in Feld \'Port\' muss 1 und 65535 liegen.';

localization/en_US.inc

@@ -4,47 +4,64 @@
  */
 $labels = array();
 
-// IMAP
-$labels['form.caption'] = 'IMAP';
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
 
 // Enabled
-$labels['form.enabled'] = 'Enabled';
+$labels['form.common.enabled'] = 'Enabled';
 
 // Label
-$labels['form.label'] = 'Label';
+$labels['form.common.label'] = 'Label';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'Value in \'Label\' field is too long (32 chars max).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host']='Server host name';
+$labels['form.imap.host'] = 'Server host name';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure']='Connection security';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Secure connection (TLS)';
 
 // Port
-$labels['form.port']='Port';
+$labels['form.imap.port'] = 'Port';
 
 // Username
-$labels['form.username'] = 'Username';
+$labels['form.imap.username'] = 'Username';
 
 // Password
-$labels['form.password'] = 'Password';
+$labels['form.imap.password'] = 'Password';
 
-// Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Folder hierarchy delimiter';
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'Value in \'Username\' field is too long (64 chars max).';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = 'Value in \'Label\' field of IMAP section is too long (32 chars max).';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = 'Value in \'Server host name\' field of IMAP section is too long (64 chars max).';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = 'Value in \'Username\' field of IMAP section is too long (64 chars max).';
+// Server host name
+$labels['form.smtp.host'] = 'Server host name';
 
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = 'Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).';
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Secure connection (TLS)';
 
-// Value in \'Port\' field of IMAP section must be a number.
-$labels['err.port.num'] = 'Value in \'Port\' field of IMAP section must be a number.';
+// Port
+$labels['form.smtp.port'] = 'Port';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = 'Value in \'Port\' field of IMAP section must be between 1 and 65535.';
+// Authorization required
+$labels['form.smtp.auth'] = 'Authorization required';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = 'Value in \'Server host name\' field is too long (64 chars max).';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = 'Value in \'Port\' field must be a number.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = 'Value in \'Port\' field must be between 1 and 65535.';

localization/ru_RU.inc

@@ -4,47 +4,64 @@
  */
 $labels = array();
 
-// IMAP
-$labels['form.caption'] = 'IMAP';
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Плагин ident_switch';
 
 // Enabled
-$labels['form.enabled'] = 'Включено';
+$labels['form.common.enabled'] = 'Включено';
 
 // Label
-$labels['form.label'] = 'Название';
+$labels['form.common.label'] = 'Название';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = '\'Название\' должно быть не длинее 32 символов.';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host'] = 'Адрес сервера';
+$labels['form.imap.host'] = 'Адрес сервера';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure'] = 'Защита подключения';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Безопасное подключение (TLS)';
 
 // Port
-$labels['form.port'] = 'Порт';
+$labels['form.imap.port'] = 'Порт';
 
 // Username
-$labels['form.username'] = 'Имя пользователя';
+$labels['form.imap.username'] = 'Имя пользователя';
 
 // Password
-$labels['form.password'] = 'Пароль';
+$labels['form.imap.password'] = 'Пароль';
 
-// Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Разделитель в иерархии папок';
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = '\'Имя пользователя\' должно быть не длинее 64 символов.';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = '\'Название\' в разделе IMAP должно быть не длинее 32 символов.';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = '\'Адрес сервера\' в разделе IMAP должен быть не длинее 64 символов.';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = '\'Имя пользователя\' в секции IMAP должно быть не длинее 64 символов.';
+// Server host name
+$labels['form.smtp.host'] = 'Адрес сервера';
 
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = '\'Разделитель в иерархии папок\' в секции IMAP должен быть не длинее 1 символа.';
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Безопасное подключение (TLS)';
 
-// Value in \'Port\' field of IMAP section must be a number.
-$labels['err.port.num'] = '\'Порт\' в секции IMAP должен быть числом.';
+// Port
+$labels['form.smtp.port'] = 'Порт';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = '\'Порт\' в секции IMAP должен быть в диапазоне от 1 до 65535.';
+// Authorization required
+$labels['form.smtp.auth'] = 'Требуется авторизация';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = '\'Адрес сервера\' должен быть не длинее 64 символов.';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = '\'Порт\' должен быть числом.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = '\'Порт\' должен быть в диапазоне от 1 до 65535.';