Username is not a required field anymore. If empty - email from identity

is used.

README.md

@@ -1,2 +1,11 @@
 # ident_switch
 ident_switch plugin for Roundcube
+
+This plugin allows users to switch between different accounts (including remote) in single Roundcube session.
+
+*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.

SQL/mysql.initial.sql

@@ -0,0 +1,38 @@
+CREATE TABLE IF NOT EXISTS ident_switch
+(
+	id
+		int(10) UNSIGNED
+		NOT NULL
+		AUTO_INCREMENT,
+	user_id
+		int(10) UNSIGNED
+		NOT NULL,
+	iid
+		int(10) UNSIGNED
+		NOT NULL,
+	username
+		varchar(64)
+		NOT NULL,
+	password
+		varchar(64),
+	host
+		varchar(64),
+	port
+		int
+		CHECK(port > 0 AND port <= 65535),
+	delimiter
+		char(1),
+	label
+		varchar(32),
+	flags
+		int
+		NOT NULL
+		DEFAULT 0,
+	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,
+	PRIMARY KEY(id),
+	INDEX IX_ident_switch_user_id (user_id),
+	INDEX IX_ident_switch_iid (iid)
+);
+

SQL/mysql/2016060200.sql

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

SQL/postgres.initial.sql

@@ -18,16 +18,14 @@ CREATE TABLE ident_switch
 	password
 		varchar(64),
 	host
-		varchar(64)
+		varchar(64),
-		NOT NULL,
 	port
 		integer
 		CHECK(port > 0 AND port <= 65535),
 	delimiter
 		char(1),
 	label
-		varchar(32)
+		varchar(32),
-		NOT NULL,
 	flags
 		integer
 		NOT NULL

SQL/postgres/2016052000.sql

@@ -0,0 +1,11 @@
+ALTER TABLE
+	ident_switch
+ALTER COLUMN
+	host
+DROP NOT NULL;
+
+ALTER TABLE
+	ident_switch
+ALTER COLUMN
+	label
+DROP NOT NULL;

SQL/postgres/2016060200.sql

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

composer.json

@@ -21,6 +21,9 @@
     "require": {
         "php": ">=5.3.0",
         "roundcube/plugin-installer": ">=0.1.3"
+    },
+	"conflict": {
+		"elm/identity_smtp": "*"
 	},
 	"support": {
 		"issues": "https://bitbucket.org/BoresExpress/ident_switch/issues"

config.inc.php

@@ -1,26 +0,0 @@
-<?php
-/* Password encryption:
-    'rcmail': encrypt passwords by default Roundcube methods.
-    'secure': encrypt passwords by using the IMAP password as encryption key.
-              NOTE: When using 'secure' encryption, If IMAP passwords are changed
-              using methods other than Roundcube Webmail interface
-              (hmail_password or password plugin) then IMAP server identities
-              passwords must be re-entered by users.
-*/
-$rcmail_config['identities_imap_crypt'] = 'rcmail';
-
-/* password encryption salt (only used for secure encryption) */
-$rcmail_config['identities_imap_salt'] = '!kQm*fF3pXe1Kbm%9';
-
-/* predefined imap hosts (associated with the domain part of the identity email property) */
-$rcmail_config['identities_imap_external'] = array(
-);
-
-$rcmail_config['identities_imap_internal'] = array(
-  'BoresSoft Webmail' => array(
-    'host' =>'localhost',
-    'delimiter' => '/',
-    'readonly' => false, // on match prevent field editing
-  ),
-);
-?>

config.inc.php.dist

@@ -1,44 +1,2 @@
 <?php
-/* Password encryption:
-    'rcmail': encrypt passwords by default Roundcube methods.
-    'secure': encrypt passwords by using the IMAP password as encryption key.
-              NOTE: When using 'secure' encryption, If IMAP passwords are changed
-              using methods other than Roundcube Webmail interface
-              (hmail_password or password plugin) then IMAP server identities
-              passwords must be re-entered by users.
-*/
-$rcmail_config['identities_imap_crypt'] = 'rcmail';
 
-/* password encryption salt (only used for secure encryption) */
-$rcmail_config['identities_imap_salt'] = '!kQm*fF3pXe1Kbm%9';
-
-/* predefined imap hosts (associated with the domain part of the identity email property) */
-$rcmail_config['identities_imap_external'] = array(
-  'gmail.com' => array(
-    'host' =>'ssl://imap.gmail.com:993',
-    'delimiter' => '/',
-    'readonly' => true, // on match prevent field editing
-  ),
-  'googlemail.com' => array(
-    'host' =>'ssl://imap.gmail.com:993',
-    'delimiter' => '/',
-    'readonly' => true, // on match prevent field editing
-  ),
-  'freenet.de' => array(
-    'host' =>'mx.freenet.de',
-    'delimiter' => '.',
-    'readonly' => false, // on match prevent field editing
-  ),
-);
-
-$rcmail_config['identities_imap_internal'] = array(
-  'mydomain.tld' => array(
-    'host' =>'ssl://imap.mydomain.tld:993',
-    'delimiter' => '/',
-    'readonly' => true, // on match prevent field editing
-  ),
-);
-
-/* auto-detect IMAP server */
-$rcmail_config['identities_imap_autodetect'] = false;
-?>

ident_switch.js

@@ -1,15 +1,44 @@
 /*
  * This is part of identity_imap plugin
  */
+
 $(function() {
-	if ($('#plugin-ident_switch-account').size() > 0) {
+	var $truName = $('.topright .username');
-		$('#plugin-ident_switch-account').prependTo('.topright');
+	if ($truName.size() > 0) {
-		$('.topright .username').hide();
+		$sw = $('#plugin-ident_switch-account');
+		if ($sw.size() > 0) {
+			$sw.prependTo('.topright');
+			$truName.hide();
 			$('#plugin-ident_switch-account').show();
+			console.log("Doing replace.");
 		}
+	}
+
+	$("INPUT[name='_ident_switch.form.enabled']").change();
+	$("SELECT[name='_ident_switch.form.secure']").change();
 });
 
+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"));
+}
+
+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) {
 	console.log("qwe1");
 	rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val });
 }
+
+function  plugin_switchIdent_fixIdent(iid) {
+	if (parseInt(iid) > 0)
+		$("#_from").val(iid);
+}

ident_switch.php

@@ -13,19 +13,23 @@ class ident_switch extends rcube_plugin
 	public $task='?(?!login|logout).*';
 
 	private $table = 'ident_switch';
+	private $my_postfix = '_iswitch';
+	private $my_log = 'ident_switch';
 
 	// Flags user in database
 	private $db_enabled		= 1;
-	private $db_secure = 2;
+	private $db_secure_ssl	= 2;
+	private $db_secure_tls	= 4;
 
 	function init()
 	{
 		$this->add_hook('startup', array($this, 'on_startup'));
 		$this->add_hook('render_page', array($this, 'on_render_page'));
-#		$this->add_hook('smtp_connect', array($this, 'on_smtp_connect'));
+		$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_delete', array($this, 'on_identity_delete'));
+		$this->add_hook('template_object_composeheaders', array($this, 'on_template_object_composeheaders'));
 
 		$this->register_action('plugin.ident_switch.switch', array($this, 'on_switch'));
 	}
@@ -33,8 +37,9 @@ class ident_switch extends rcube_plugin
 	function on_startup($args)
 	{
 		$rc = rcmail::get_instance();
+		error_log('Task: ' . $args['task'] . ', action: ' . $args['action']);
 
-		if (strtolower($rc->user->data['username']) != strtolower($_SESSION['username']))
+		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 1)
 		{ // We are impersonating
 			$rc->config->set('imap_cache', null);
 			$rc->config->set('messages_cache', false);
@@ -52,31 +57,61 @@ class ident_switch extends rcube_plugin
 	function on_render_page($args)
 	{
 		$rc = rcmail::get_instance();
+		error_log('Template: ' . $args['template']);
+
+		// Currently selected identity
+		$iid = $_SESSION['iid' . $this->my_postfix];
+
+		$iid_int = 0;
+		if (is_int($iid))
+			$iid_int = $iid;
+		elseif ($iid === '-1')
+			$iid_int = -1;
+		elseif (ctype_digit($iid))
+			$iid_int = intval($iid);
 
 		// Get list of alternative accounts
 		$sOpt = '';
-		$sql = 'SELECT id, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0';
+		$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0';
 		$q = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled);
 		while ($r = $rc->db->fetch_assoc($q))
 		{
 			$opts = array('value' => $r['id']);
-			if (strcasecmp($_SESSION['username'], $r['username']) === 0)
+			if ($iid_int == $r['iid'])
 				$opts['selected'] = 'selected';
 
+			// Make label
+			$lbl = $r['label'];
+			if (!$lbl)
+			{
+				if (!$r['username'])
+				{ // Load email from identity
+					$sql = 'SELECT email FROM ' . $rc->db->table_name('identities') . ' WHERE identity_id = ?';
+					$q = $rc->db->query($sql, $r['iid']);
+					$rIid = $rc->db->fetch_assoc($q);
+
+					$r['username'] = $rIid['email'];
+				}
+
+				if (strpos($r['username'], '@') === false)
+					$lbl = $r['username'] . '@' . ($r['host'] ? $r['host'] : 'localhost');
+				else
+					$lbl = $r['username'];
+			}
+
 			$sOpt .= html::tag(
 				'option',
 				$opts,
-				$r['label']
+				rcube::Q($lbl)
 			);
 		}
 
 		// Render UI if user has extra accounts
 		if (!empty($sOpt))
 		{
-
 			// Add main account
 			$opts = array('value' => -1);
-			if (strcasecmp($_SESSION['username'], $rc->user->data['username']) === 0)
+			if (!$iid || $iid_int == -1)
 				$opts['selected'] = 'selected';
 
 			$sOpt = html::tag(
@@ -103,26 +138,47 @@ class ident_switch extends rcube_plugin
 
 	function on_smtp_connect($args)
 	{
-		error_log('on_smtp_connect');
+		$rc = rcmail::get_instance();
+
+		// TODO: Rewrite with full settings!
+
+		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0)
+		{
+			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]);
+		}
+
+		return $args;
 	}
 
 	function on_identity_form($args)
 	{
 		$rc = rcmail::get_instance();
+
+		// Do not show options for default identity
+		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
+			return $args;
+
 		$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'),
+				'ident_switch.form.enabled' => array('type' => 'checkbox', 'onchange' => 'plugin_switchIdent_enabled_onChange();'),
-				'ident_switch.form.label' => array('type' => 'text', 'size' => 32),
+				'ident_switch.form.label' => array('type' => 'text', 'size' => 32, 'placeholder' => $args['record']['email']),
-				'ident_switch.form.host' => array('type' => 'text', 'size' => 64),
+				'ident_switch.form.host' => array('type' => 'text', 'size' => 64, 'placeholder' => 'localhost'),
-				'ident_switch.form.secure' => array('type' => 'checkbox'),
+				'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),
+				'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),
+				'ident_switch.form.delimiter' => array('type' => 'text', 'size' => 1, 'placeholder' => '.'),
 			),
 		);
 
@@ -140,8 +196,10 @@ class ident_switch extends rcube_plugin
 				// Parse flags
 				if ($r['flags'] & $this->db_enabled)
 					$args['record']['ident_switch.form.enabled'] = true;
-				if ($r['flags'] & $this->db_secure)
+				if ($r['flags'] & $this->db_secure_tls) // TLS has priority
-					$args['record']['ident_switch.form.secure'] = true;
+					$args['record']['ident_switch.form.secure'] = 'tls';
+				elseif ($r['flags'] & $this->db_secure_ssl)
+					$args['record']['ident_switch.form.secure'] = 'ssl';
 			}
 		}
 
@@ -152,43 +210,110 @@ class ident_switch extends rcube_plugin
 	{
 		$rc = rcmail::get_instance();
 
-		// TODO: check field values
+		// Do not do anything for default identity
+		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
+			return $args;
 
-		$sql = 'SELECT NULL FROM ' . $rc->db->table_name($this->table) . ' WHERE iid = ? AND user_id = ?';
+		// Process boolean fields
+		$flags = 0;
+		if (get_input_value('_ident_switch_form_enabled', RCUBE_INPUT_POST))
+			$flags |= $this->db_enabled;
+
+		if (!($flags & $this->db_enabled))
+		{
+			$this->sw_imap_off($args['iid']);
+			return $args;
+		}
+
+		// Check field values
+		$errMsg = '';
+
+		$fLabel = self::ntrim(get_input_value('_ident_switch_form_label', RCUBE_INPUT_POST));
+		if (strlen($fLabel) > 32)
+			$errMsg = 'label.long';
+		else
+		{
+			$fHost = self::ntrim(get_input_value('_ident_switch_form_host', RCUBE_INPUT_POST));
+			if (strlen($fHost) > 64)
+				$errMsg = 'host.long';
+			else
+			{
+				$fPort = self::ntrim(get_input_value('_ident_switch_form_port', RCUBE_INPUT_POST));
+				if ($fPort && !ctype_digit($fPort))
+					$errMsg = 'port.num';
+				else
+				{
+					if ($fPort && ($fPort <= 0 || $fPort > 65535))
+						$errMsg = 'port.range';
+					else
+					{
+						$fUser = self::ntrim(get_input_value('_ident_switch_form_username', RCUBE_INPUT_POST));
+						if (strlen($fUser) > 64)
+							$errMsg = 'user.long';
+						else
+						{
+							$fDelim = self::ntrim(get_input_value('_ident_switch_form_delimiter', RCUBE_INPUT_POST));
+							if (strlen($fDelim) > 1)
+								$errMsg = 'delim.long';
+						}
+					}
+				}
+			}
+		}
+
+		if ($errMsg)
+		{
+			$this->add_texts('localization');
+			$rc->output->show_message('ident_switch.err.' . $errMsg, 'error');
+			$args['abort'] = true;
+			return $args;
+		}
+
+		// Parse secure settings
+		$ssl = get_input_value('_ident_switch_form_secure', RCUBE_INPUT_POST);
+		if (strcasecmp($ssl, 'tls') === 0)
+			$flags |= $this->db_secure_tls;
+		elseif (strcasecmp($ssl, 'ssl') === 0)
+			$flags |= $this->db_secure_ssl;
+
+		$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 = ?';
+				' SET flags = ?, label = ?, host = ?, port = ?, username = ?, password = ?, delimiter = ?, user_id = ?, iid = ?' .
+				' WHERE id = ?';
 		}
-		else
+		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 (?, ?, ?, ?, ?, ?, ?, ?, ?)';
 		}
 
-		// Process boolean fields
+		if ($sql)
-		$flags = 0;
+		{
-		if (get_input_value('_ident_switch_form_enabled', RCUBE_INPUT_POST))
+			// Do we need to update pwd?
-			$flags |= $this->db_enabled;
+			$fPass = get_input_value('_ident_switch_form_password', RCUBE_INPUT_POST);
-		if (get_input_value('_ident_switch_form_secure', RCUBE_INPUT_POST))
+			if ($fPass != $r['password'])
-			$flags |= $this->db_secure;
+				$fPass = $rc->encrypt($fPass);
 
 			$rc->db->query(
 				$sql,
 				$flags,
-			get_input_value('_ident_switch_form_label', RCUBE_INPUT_POST),
+				$fLabel,
-			get_input_value('_ident_switch_form_host', RCUBE_INPUT_POST),
+				$fHost,
-			get_input_value('_ident_switch_form_port', RCUBE_INPUT_POST),
+				$fPort,
-			get_input_value('_ident_switch_form_username', RCUBE_INPUT_POST),
+				$fUser,
-			$rc->encrypt(get_input_value('_ident_switch_form_password', RCUBE_INPUT_POST)),
+				$fPass,
-			get_input_value('_ident_switch_form_delimiter', RCUBE_INPUT_POST),
+				$fDelim,
 				$rc->user->ID,
-			$args['id']
+				$args['id'],
+				$r['id']
 			);
+		}
 
 		return $args;
 	}
@@ -198,56 +323,89 @@ class ident_switch extends rcube_plugin
 		$rc = rcmail::get_instance();
 
 		$sql = 'DELETE FROM ' . $rc->db->table_name($this->table) . ' WHERE iid = ? AND user_id = ?';
-		$rc->db->query($sql, $args['id'], $rc->user->ID);
+		$q = $rc->db->query($sql, $args['id'], $rc->user->ID);
 
-		// TODO: Affected rows count for log
+		if ($rc->db->affected_rows($q))
+			$rc->write_log($this->my_log, 'Deleted associated information for identity with ID = ' . $args['id'] . '.');
 
 		return $args;
 	}
 
+	function on_template_object_composeheaders($args)
+	{
+		if ($args['id'] == '_from')
+		{
+			$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');
+				else
+					$rc->write_log($this->my_log, 'Special session variable with active identity ID not found.');
+			}
+		}
+	}
+
 	function on_switch()
 	{
 		$rc = rcmail::get_instance();
 
-		$my_postfix = '_iswitch';
+		$my_postfix_len = strlen($this->my_postfix);
-		$my_postfix_len = strlen($my_postfix);
-
-		error_log('Switcing account!'); // TODO: Add nornal logging here!
-
 		$identId = rcube_utils::get_input_value('_ident-id', RCUBE_INPUT_POST);
-		error_log($identId);
 
 		if (-1 == $identId)
 		{ // Switch to main account
+			$rc->write_log($this->my_log, 'Switching mailbox back to default.');
+
 			foreach ($_SESSION as $k => $v)
 			{
-				if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $my_postfix, -$my_postfix_len, $my_postfix_len) === 0)
+				if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $this->my_postfix, -$my_postfix_len, $my_postfix_len) === 0)
 				{
-					error_log($k . '=>' . $v);
+					$_SESSION[$k] = $_SESSION[$k . $this->my_postfix];
-					$_SESSION[$k] = $_SESSION[$k . $my_postfix];
+					$rc->session->remove($k . $this->my_postfix);
-					$rc->session->remove($k . $my_postfix);
 				}
 			}
 			$_SESSION['username'] = $rc->user->data['username'];
-			$_SESSION['password'] = $_SESSION['password' . $my_postfix];
+			$_SESSION['password'] = $_SESSION['password' . $this->my_postfix];
+			$_SESSION['iid' . $this->my_postfix] = -1;
 		}
 		else
 		{
-			$sql = 'SELECT host, flags, port, username, password FROM ' . $rc->db->table_name($this->table) . ' WHERE id = ? AND user_id = ?';
+			$sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name($this->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))
 			{
-				$port = $r['port'];
+				if (!$r['username'])
-				$ssl = false;
+				{ // Load email from identity
-				if ($r['flags'] & $this->db_secure)
+					$sql = 'SELECT email FROM ' . $rc->db->table_name('identities') . ' WHERE identity_id = ?';
-				{
+					$q = $rc->db->query($sql, $r['iid']);
-					$ssl = true;
+					$rIid = $rc->db->fetch_assoc($q);
-					if (!$port)
+
-						$port = 993; // Default SSL/TLS port here!
+					$r['username'] = $rIid['email'];
 				}
+
+				$rc->write_log(
+					$this->my_log,
+					'Switching mailbox to one for identity with ID = ' . $r['iid'] . ' (username = \'' . $r['username'] . '\').'
+				);
+
+				$def_port = 143; // Default port here!
+				$ssl = null;
+				if ($r['flags'] & $this->db_secure_tls)
+				{
+					$ssl = 'tls';
+					$def_port = 143; // Default 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 = 143; // Default port here!
+					$port = $def_port;
 
 				// If we are in default account now
 				// save everything with STORAGE
@@ -255,28 +413,30 @@ class ident_switch extends rcube_plugin
 				{
 					foreach ($_SESSION as $k => $v)
 					{
-						if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $my_postfix, -$my_postfix_len, $my_postfix_len) !== 0)
+						if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $this->my_postfix, -$my_postfix_len, $my_postfix_len) !== 0)
 						{
-							error_log($k . '=>' . $v);
+							if (!$_SESSION[$k . $this->my_postfix])
-							$_SESSION[$k . $my_postfix] = $_SESSION[$k];
+								$_SESSION[$k . $this->my_postfix] = $_SESSION[$k];
                             $rc->session->remove($k);
 						}
 					}
 				}
-				$_SESSION['password' . $my_postfix] = $_SESSION['password'];
+				if (!$_SESSION['password' . $this->my_postfix])
+					$_SESSION['password' . $this->my_postfix] = $_SESSION['password'];
 
-				$_SESSION['storage_host'] = $r['host'];
+				$_SESSION['storage_host'] = $r['host'] ? $r['host'] : 'localhost'; // Default 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'];
 
 				$rc->session->remove('folders');
 			}
 			else
 			{
 				// TODO: Show message in browser
-				error_log('Requested account not found!');
+				$rc->write_log($this->my_log, 'Requested remote mailbox with ID = ' . $identId . ' not found.');
 				return;
 			}
 		}
@@ -288,4 +448,24 @@ class ident_switch extends rcube_plugin
 			)
 		);
 	}
+
+	protected 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);
+	}
+
+	protected static function ntrim($str)
+	{
+		if (is_null($str))
+			return $str;
+
+		$s = trim($str);
+		if (!$s)
+			return null;
+
+		return $s;
+	}	
 }

localization/en_US.inc

@@ -13,8 +13,14 @@ $labels['form.enabled'] = 'Enabled';
 // Label
 $labels['form.label'] = 'Label';
 
-// Server URI
+// Server host name
-$labels['form.server']='Server URI';
+$labels['form.host']='Server host name';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure']='Connection security';
+
+// Port
+$labels['form.port']='Port';
 
 // Username
 $labels['form.username'] = 'Username';
@@ -24,3 +30,21 @@ $labels['form.password'] = 'Password';
 
 // Folder hierarchy delimiter
 $labels['form.delimiter'] = 'Folder hierarchy delimiter';
+
+// 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).';
+
+// 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).';
+
+// 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).';
+
+// 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.';
+
+// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+$labels['err.port.rtange'] = 'Value in \'Port\' field of IMAP section must be between 1 and 65535.';

localization/ru_RU.inc

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// IMAP
+$labels['form.caption'] = 'IMAP';
+
+// Enabled
+$labels['form.enabled'] = 'Включено';
+
+// Label
+$labels['form.label'] = 'Название';
+
+// Server host name
+$labels['form.host'] = 'Адрес сервера';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure'] = 'Защита подключения';
+
+// Port
+$labels['form.port'] = 'Порт';
+
+// Username
+$labels['form.username'] = 'Имя пользователя';
+
+// Passwotrd
+$labels['form.password'] = 'Пароль';
+
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Разделитель в иерархии папок';
+
+// 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 символов.';
+
+// Value in \'Username\' field of IMAP section is too long (64 chars max).
+$labels['err.user.long'] = '\'Имя пользователя\' в секции IMAP должно быть не длинее 64 символов.';
+
+// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
+$labels['err.delim.long'] = '\'Разделитель в иерархии папок\' в секции IMAP должен быть не длинее 1 символа.';
+
+// Value in \'Port\' field of IMAP section must be a number.
+$labels['err.port.num'] = '\'Порт\' в секции IMAP должен быть числом.';
+
+// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+$labels['err.port.rtange'] = '\'Порт\' в секции IMAP должен быть в диапазоне от 1 до 65535.';

skins/classic/identities_imap.css

@@ -1,15 +0,0 @@
-/***************************************************************************
- * This file is part of Roundcube "identities_imap" plugin.              
- *                                                                 
- * Your are not allowed to distribute this file or parts of it.    
- *                                                                 
- * This file is distributed in the hope that it will be useful,    
- * but WITHOUT ANY WARRANTY; without even the implied warranty of  
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          
- *                                                                 
- * Copyright (c) 2012 - 2014 Roland 'Rosali' Liebl - all rights reserved
- * dev-team [at] myroundcube [dot] com
- * http://myroundcube.com
- ***************************************************************************/
-
-#accounts{position:absolute; top:63px; left:18px;}.remotehint{z-index:-1; position:absolute; top:7px; margin-left:auto; left:210px; width:400px; border-radius:5px; padding:4px; -moz-border-radius:5px; border:1px solid #DEEEFC; background:#F2F9FF; text-align:center; color:#3F70BA; display:inline;}.classic{top:2px;}

skins/larry/identities_imap.css

@@ -1,15 +0,0 @@
-/***************************************************************************
- * This file is part of Roundcube "identities_imap" plugin.              
- *                                                                 
- * Your are not allowed to distribute this file or parts of it.    
- *                                                                 
- * This file is distributed in the hope that it will be useful,    
- * but WITHOUT ANY WARRANTY; without even the implied warranty of  
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          
- *                                                                 
- * Copyright (c) 2012 - 2014 Roland 'Rosali' Liebl - all rights reserved
- * dev-team [at] myroundcube [dot] com
- * http://myroundcube.com
- ***************************************************************************/
-
-select.deco{height:18px; font-size:12px; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; color:#fff; background:#444; border:1px solid #ababab;}.remotehint{z-index:1; position:absolute; top:1px; margin-left:auto; left:50%; margin-left:-200px; width:400px; border-radius:5px; padding:4px; -moz-border-radius:5px; border:1px solid #DEEEFC; background:#F2F9FF; text-align:center; color:#3F70BA; display:inline;}

skins/litecube/identities_imap.css

@@ -1,15 +0,0 @@
-/***************************************************************************
- * This file is part of Roundcube "##PLUGIN##" plugin.              
- *                                                                 
- * Your are not allowed to distribute this file or parts of it.    
- *                                                                 
- * This file is distributed in the hope that it will be useful,    
- * but WITHOUT ANY WARRANTY; without even the implied warranty of  
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          
- *                                                                 
- * Copyright (c) 2012 - ##YEAR## Roland 'Rosali' Liebl - all rights reserved
- * dev-team [at] myroundcube [dot] com
- * http://myroundcube.com
- ***************************************************************************/
-
-select.deco{}#taskbar .remotehint{position:absolute; top:52px; left:50%; margin-left:-200px; width:400px; padding:0px; border:1px solid #DEEEFC; background-color:#F2F9FF; text-align:center; font-size:10px; color:#3F70BA;}