Finally works correct for SMTP too. Closes #24.

Someone please check MySQL script!

README.md

@@ -16,3 +16,6 @@ This plugin allows users to switch between different accounts (including remote)
 * Branch 3.X - for Roundcube v1.3
 
 Please specify verion 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 ypur Roundcube installation.
+
+### Switching SMTP ###
+Plugin also switched SMTP credentials but only for server specified in general config. You should use %u and %p substitutions for user and password to make it work. This substitutions are replaced by username and password for selected IMAP account.

SQL/mysql.initial.sql

@@ -11,8 +11,7 @@ CREATE TABLE IF NOT EXISTS ident_switch
 		int(10) UNSIGNED
 		NOT NULL,
 	username
-		varchar(64)
+		varchar(64),
-		NOT NULL,
 	password
 		varchar(64),
 	host

SQL/mysql/2018071600.sql

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

SQL/postgres.initial.sql

@@ -13,8 +13,7 @@ CREATE TABLE ident_switch
 		REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
 		UNIQUE,
 	username
-		varchar(64)
+		varchar(64),
-		NOT NULL,
 	password
 		varchar(64),
 	host

SQL/postgres/2018081600.sql

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

ident_switch-form.js

@@ -0,0 +1,10 @@
+/*
+ * This is part of identity_imap plugin
+ */
+
+$(function() {
+	$("INPUT[name='_ident_switch.form.enabled']").change();
+	$("SELECT[name='_ident_switch.form.secure']").change();
+	plugin_switchIdent_processPreconfig();
+});
+

ident_switch-form.min.js

@@ -0,0 +1 @@
+$(function(){$("INPUT[name='_ident_switch.form.enabled']").change();$("SELECT[name='_ident_switch.form.secure']").change();plugin_switchIdent_processPreconfig();});

ident_switch-switch.js

@@ -3,22 +3,50 @@
  */
 
 $(function() {
-	var $truName = $('.topright .username');
-	if ($truName.length > 0) {
 	$sw = $('#plugin-ident_switch-account');
-		if ($sw.length > 0) {
+	isOk = false;
-			$sw.prependTo('.topright');
+
-			$truName.hide();
+	switch (rcmail.env['skin']) {
-			$('#plugin-ident_switch-account').show();
+		case 'larry':
-		}
+			isOk = plugin_switchIdent_addCbLarry($sw);
+			break;
+		case 'classic':
+			isOk = plugin_switchIdent_addCbClassic($sw);
+			break;
 	}
 
+	if (isOk)
+		$sw.show();
+
 	$("INPUT[name='_ident_switch.form.enabled']").change();
 	$("SELECT[name='_ident_switch.form.secure']").change();
-
 	plugin_switchIdent_processPreconfig();
 });
 
+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_processPreconfig() {
 	var disFld = $("INPUT[name='_ident_switch.form.readonly']");
 	disFld.parentsUntil("TABLE", "TR").hide();

ident_switch-switch.min.js

@@ -0,0 +1,15 @@
+$(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;}
+if(isOk)
+$sw.show();$("INPUT[name='_ident_switch.form.enabled']").change();$("SELECT[name='_ident_switch.form.secure']").change();plugin_switchIdent_processPreconfig();});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_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.length>0){$sw=$('#plugin-ident_switch-account');if($sw.length>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

@@ -58,16 +58,31 @@ class ident_switch extends rcube_plugin
 	{
 		$rc = rcmail::get_instance();
 
-		// Currently selected identity
+		switch ($rc->task)
-		$iid = $_SESSION['iid' . self::MY_POSTFIX];
+		{
+		case 'mail':
+			$this->render_switch($rc, $args);
+		case 'settings':
+			$this->include_script('ident_switch-form.js');
+			break;
+		}
 
-		$iid_int = 0;
+
-		if (is_int($iid))
+		return $args;
-			$iid_int = $iid;
+	}
-		elseif ($iid === '-1')
+
-			$iid_int = -1;
+	private function render_switch($rc, $args)
-		elseif (ctype_digit($iid))
+	{
-			$iid_int = intval($iid);
+		// 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 = '';
@@ -76,7 +91,7 @@ class ident_switch extends rcube_plugin
 		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
@@ -110,7 +125,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(
@@ -119,7 +134,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(
@@ -131,22 +146,33 @@ 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!
+		$sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
-
+		$q = $rc->db->query($sql, $iid ,$rc->user->ID);
-		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0)
+		$r = $rc->db->fetch_assoc($q);
+		if (is_array($r))
 		{
-			if ($args['smtp_user'] == '%u')
+			if (!$r['username'])
-				$args['smtp_user'] = $rc->user->data['username'];
+			{ // Load email from identity
-			if ($args['smtp_pass'] == '%p')
+				$sql = 'SELECT email FROM ' . $rc->db->table_name('identities') . ' WHERE identity_id = ?';
-				$args['smtp_pass'] = $rc->decrypt($_SESSION['password' . self::MY_POSTFIX]);
+				$q = $rc->db->query($sql, $r['iid']);
+				$rIid = $rc->db->fetch_assoc($q);
+
+				$r['username'] = $rIid['email'];
+			}
+
+			// Exactly the same in core SMTP handler
+			$args['smtp_user'] = str_replace('%u', $r['username'], $args['smtp_user']);
+			$args['smtp_pass'] = str_replace('%p', $rc->decrypt($r['password']), $args['smtp_pass']);
 		}
 
 		return $args;
@@ -162,26 +188,6 @@ 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
 		if (isset($args['record']['identity_id']))
 		{
@@ -214,6 +220,52 @@ class ident_switch extends rcube_plugin
 				$this->apply_preconfig($args['record']);
 		}
 
+		// Create our field set
+		// Do that manually decause standard processing shows hidden fields (WTF?)
+		$fieldset = 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'),
+		);
+
+		// Process fields
+		$addAfter = '';
+		$table = new html_table(array('cols' => 2));
+		foreach ($fieldset as $col => $colprop)
+		{
+			$data = $args['record'][$col];
+			if ($colprop['type'] == 'hidden')
+			{
+				$addAfter .= rcube_output::get_edit_field($col, $data, $colprop, $colprop['type']);
+			}
+			else
+			{
+				$colprop['id'] = 'rcmfd_' . $col;
+
+				$label = $colprop['label'] ?: $this->gettext(str_replace('-', '', $col));
+                $value = $colprop['value'] ?: rcube_output::get_edit_field($col, $data, $colprop, $colprop['type']);
+
+				$table->add('title', html::label($colprop['id'], rcube::Q($label)));
+                $table->add(null, $value);
+			}
+		}
+
+		// Set data for output
+		$args['form']['ident_switch'] = array(
+			'name' => $this->gettext('form.caption'),
+			'content' => $table->show(array('class' => 'propform')) . $addAfter // TODO: copy styles from other tables
+		);
+
 		return $args;
 	}