Bump up version

Closes #61

.gitattributes

@@ -0,0 +1,8 @@
+*			text=auto
+
+*.sql       text
+*.php       text
+*.inc       text
+*.js        text
+*.md        text
+*.php.dist  text

.gitignore

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

README.md

@@ -1,21 +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 ###
-* Branch 1.X - for Roundcube v1.1
-* Branch 2.X - for Roundcube v1.2
-* Branch 3.X - for Roundcube v1.3
+* 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 1.4.
 
-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.
+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

@@ -1,37 +1,54 @@
-CREATE TABLE IF NOT EXISTS ident_switch
+CREATE TABLE IF NOT EXISTS `ident_switch`
 (
-	id
+	`id`
 		int(10) UNSIGNED
 		NOT NULL
 		AUTO_INCREMENT,
-	user_id
+	`user_id`
 		int(10) UNSIGNED
 		NOT NULL,
-	iid
+	`iid`
 		int(10) UNSIGNED
 		NOT NULL,
-	username
+	`username`
 		varchar(64),
-	password
+	`password`
 		varchar(64),
-	host
+	`imap_host`
 		varchar(64),
-	port
+	`imap_port`
 		int
-		CHECK(port > 0 AND port <= 65535),
-	delimiter
+		CHECK(`imap_port` > 0 AND `imap_port` <= 65535),
+	`imap_delimiter`
 		char(1),
-	label
+	`label`
 		varchar(32),
-	flags
+	`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)
+	`smtp_host`
+		varchar(64),
+	`smtp_port`
+		int
+		CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535),
+	`smtp_auth`
+        smallint
+        NOT NULL
+        DEFAULT 1,
+	`drafts_mbox`
+		varchar(64),
+	`sent_mbox`
+		varchar(64),
+	`junk_mbox`
+		varchar(64),
+	`trash_mbox`
+		varchar(64),
+	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

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

SQL/mysql/2018071600.sql

@@ -1,6 +1,6 @@
 ALTER TABLE
-	ident_switch
+	`ident_switch`
 MODIFY
-	username
-	varchar(64)
-	NULL;
+	`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/mysql/2019112000.sql

@@ -0,0 +1,5 @@
+ALTER TABLE
+  `ident_switch`
+ADD COLUMN
+	`imap_delimiter`
+    char(1);

SQL/mysql/2019121300.sql

@@ -0,0 +1,14 @@
+ALTER TABLE
+  `ident_switch`
+ADD COLUMN
+	`drafts_mbox`
+        varchar(64),
+ADD COLUMN
+	`sent_mbox`
+        varchar(64),
+ADD COLUMN
+	`junk_mbox`
+        varchar(64),
+ADD COLUMN
+	`trash_mbox`
+        varchar(64);

SQL/mysql/2020060100.sql

@@ -0,0 +1,7 @@
+ALTER TABLE
+  `ident_switch`
+ADD COLUMN
+	`smtp_auth`
+        smallint
+        NOT NULL
+        DEFAULT 1;

SQL/postgres.initial.sql

@@ -1,38 +1,55 @@
-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),
-	host
-		varchar(64),
-	port
-		integer
-		CHECK(port > 0 AND port <= 65535),
-	delimiter
-		char(1),
-	label
-		varchar(32),
-	flags
-		integer
-		NOT NULL
-		DEFAULT(0),
-	UNIQUE (user_id, label)
-);
-
-CREATE INDEX
-	IX_ident_switch_user_id
-ON
-	ident_switch(user_id);
+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),
+	imap_delimiter
+	    char(1),
+	label
+		varchar(32),
+	flags
+		integer
+		NOT NULL
+		DEFAULT(0),
+	smtp_host
+	  varchar(64),
+    smtp_port
+		integer
+		CHECK(smtp_port > 0 AND smtp_port <= 65535),
+	smtp_auth
+        smallint
+        NOT NULL
+        DEFAULT(1),
+    drafts_mbox
+        varchar(64),
+    sent_mbox
+        varchar(64),
+    junk_mbox
+        varchar(64),
+    trash_mbox
+        varchar(64),
+	UNIQUE (user_id, label)
+);
+
+CREATE INDEX
+	IX_ident_switch_user_id
+ON
+	ident_switch(user_id);

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/postgres/2019112000.sql

@@ -0,0 +1,5 @@
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	imap_delimiter
+    char(1);

SQL/postgres/2019121300.sql

@@ -0,0 +1,14 @@
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	drafts_mbox
+    varchar(64),
+ADD COLUMN
+	sent_mbox
+    varchar(64),
+ADD COLUMN
+	junk_mbox
+    varchar(64),
+ADD COLUMN
+	trash_mbox
+    varchar(64);

SQL/postgres/2020060100.sql

@@ -0,0 +1,7 @@
+ALTER TABLE
+  ident_switch
+ADD COLUMN
+	smtp_auth
+        smallint
+        NOT NULL
+        DEFAULT(1);

SQL/sqlite.initial.sql

@@ -0,0 +1,40 @@
+CREATE TABLE ident_switch
+(
+	id
+		integer
+		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),
+    imap_delimiter
+        char(1),
+	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,76 @@
+PRAGMA foreign_keys=off;
+BEGIN TRANSACTION;
+
+ALTER TABLE ident_switch RENAME TO ident_switch_old;
+
+CREATE TABLE ident_switch
+(
+	id
+		integer
+		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);
+
+INSERT OR ROLLBACK INTO
+  ident_switch (
+    id,
+    user_id,
+    iid,
+    username,
+    password,
+    imap_host,
+    imap_port,
+    label,
+    flags,
+    smtp_host
+  )
+SELECT
+  id,
+  user_id,
+  iid,
+  username,
+  password,
+  host,
+  port,
+  label,
+  flags,
+  host,
+FROM
+  ident_switch_old;
+
+DROP TABLE
+  ident_switch_old;
+
+COMMIT;
+PRAGMA foreign_keys=on;

composer.json

@@ -5,6 +5,7 @@
 	"homepage": "https://bitbucket.org/BoresExpress/ident_switch",
 	"keywords": ["identity", "imap", "mail", "switch"],
     "license": "GPL-3.0+",
+    "version": "4.3.1",
     "authors": [
         {
             "name": "Boris Gulay",
@@ -19,8 +20,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": "*"

ident_switch-form.js

@@ -3,8 +3,33 @@
  */
 
 $(function() {
-	$("INPUT[name='_ident_switch.form.enabled']").change();
-	$("SELECT[name='_ident_switch.form.secure']").change();
+	$("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

@@ -1 +1 @@
-$(function(){$("INPUT[name='_ident_switch.form.enabled']").change();$("SELECT[name='_ident_switch.form.secure']").change();plugin_switchIdent_processPreconfig();});
+$(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

@@ -13,14 +13,13 @@ $(function() {
 		case 'classic':
 			isOk = plugin_switchIdent_addCbClassic($sw);
 			break;
+        case 'elastic':
+            isOk = plugin_switchIdent_addCbElastic($sw);
+            break;
 	}
 
 	if (isOk)
-		$sw.show();
-
-	$("INPUT[name='_ident_switch.form.enabled']").change();
-	$("SELECT[name='_ident_switch.form.secure']").change();
-	plugin_switchIdent_processPreconfig();
+        $sw.show();
 });
 
 function plugin_switchIdent_addCbLarry($sw) {
@@ -47,39 +46,22 @@ function plugin_switchIdent_addCbClassic($sw) {
 	return false;
 }
 
-function plugin_switchIdent_processPreconfig() {
-	var disFld = $("INPUT[name='_ident_switch.form.readonly']");
-	disFld.parentsUntil("TABLE", "TR").hide();
+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;
+    }
 
-	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);
+    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 });
 }
 

ident_switch-switch.min.js

@@ -1,15 +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;}
-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);}
+$(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.php

@@ -16,9 +16,13 @@ class ident_switch extends rcube_plugin
 	const MY_POSTFIX = '_iswitch';
 
 	// Flags user in database
-	const DB_ENABLED		= 1;
-	const DB_SECURE_SSL		= 2;
-	const DB_SECURE_TLS		= 4;
+	const DB_ENABLED		    = 1;
+	//const DB_SECURE_SSL		= 2; // Not supported any more
+	const DB_SECURE_IMAP_TLS	= 4;
+
+	// SMTP auth values
+	const SMTP_AUTH_IMAP = 1;
+	const SMTP_AUTH_NONE = 2;
 
 	function init()
 	{
@@ -31,8 +35,18 @@ class ident_switch extends rcube_plugin
 		$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'));
+		$this->add_hook('preferences_list', array($this, 'on_special_folders_form'));
+		$this->add_hook('preferences_save', array($this, 'on_special_folders_update'));
 
 		$this->register_action('plugin.ident_switch.switch', array($this, 'on_switch'));
+
+		$rc = rcmail::get_instance();
+		foreach (rcube_storage::$folder_types as $type)
+		{
+			$key = $type . '_mbox_default' . self::MY_POSTFIX;
+			if (!$_SESSION[$key])
+				$_SESSION[$key] = $rc->config->get($type . '_mbox');
+		}
 	}
 
 	function on_startup($args)
@@ -51,6 +65,14 @@ class ident_switch extends rcube_plugin
 			}
 		}
 
+		foreach (rcube_storage::$folder_types as $type)
+		{
+			$defaultKey = $type . '_mbox_default' . self::MY_POSTFIX;
+			$otherKey = $type . '_mbox' . self::MY_POSTFIX;
+			$val = $_SESSION[$otherKey] ? $_SESSION[$otherKey] : $_SESSION[$defaultKey];
+			$rc->config->set($type . '_mbox', $val);
+		}
+
 		return $args;
 	}
 
@@ -62,6 +84,7 @@ class ident_switch extends rcube_plugin
 		{
 		case 'mail':
 			$this->render_switch($rc, $args);
+			break;
 		case 'settings':
 			$this->include_script('ident_switch-form.js');
 			break;
@@ -83,80 +106,64 @@ class ident_switch extends rcube_plugin
 			$iid = -1;
 		elseif (ctype_digit($iid_s))
 			$iid = intval($iid_s);
+		
+		$accNames = array($_SESSION['global_alias'] ? $_SESSION['global_alias'] : $rc->user->data['username']);
+		$accValues = array(-1);
+		$accSelected = -1;
 
 		// Get list of alternative accounts
-		$sOpt = '';
-		$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE user_id = ? AND flags & ? > 0';
+		$sql = "SELECT "
+			. "isw.id, isw.iid, isw.label, isw.username, ii.email"
+			. " FROM"
+			. " {$rc->db->table_name(self::TABLE)} isw"
+			. " INNER JOIN {$rc->db->table_name('identities')} ii ON isw.iid=ii.identity_id"
+			. " WHERE isw.user_id = ? AND isw.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']);
+			$accValues[] = $r['id'];
 			if ($iid == $r['iid'])
-				$opts['selected'] = 'selected';
+				$accSelected = $r['id'];
 
 			// 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'];
-				}
+					$r['username'] = $r['email'];
 
 				if (strpos($r['username'], '@') === false)
 					$lbl = $r['username'] . '@' . ($r['host'] ? $r['host'] : 'localhost');
 				else
 					$lbl = $r['username'];
 			}
-
-			$sOpt .= html::tag(
-				'option',
-				$opts,
-				rcube::Q($lbl)
-			);
+			$accNames[] = rcube::Q($lbl);
 		}
 
 		// Render UI if user has extra accounts
-		if (!empty($sOpt))
+		if (count($accValues) > 1)
 		{
-			// Add main account
-			$opts = array('value' => -1);
-			if ($iid <= 0)
-				$opts['selected'] = 'selected';
-
-			$sOpt = html::tag(
-				'option',
-				$opts,
-				$_SESSION['global_alias'] ? $_SESSION['global_alias'] : $rc->user->data['username']
-			) . $sOpt;
-
 			$this->include_script('ident_switch-switch.js');
-			$sw = html::tag(
-				'select', 
-				array(
-					'id' => 'plugin-ident_switch-account',
-					'style' => 'display: none; padding: 0;',
-					'onchange' => 'plugin_switchIdent_switch(this.value);',
-				),
-				$sOpt
-			);
-			$rc->output->add_footer($sw);
+
+			$select = new html_select(array(
+				'id' => 'plugin-ident_switch-account',
+				'style' => 'display: none; padding: 0;',
+				'onchange' => 'plugin_switchIdent_switch(this.value);',
+			));
+			$select->add($accNames, $accValues);
+			$rc->output->add_footer($select->show(array($accSelected)));
 		}
 	}
 
 	function on_smtp_connect($args)
 	{
 		$iid = $_SESSION['iid' . self::MY_POSTFIX];
-		if (!is_integer($iid) || $iid == -1)
+		if (!is_numeric($iid) || $iid == -1)
 			return $args;
 
 		$rc = rcmail::get_instance();
 
-		$sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
+		$sql = 'SELECT smtp_host, flags, smtp_port, username, smtp_auth, 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))
@@ -164,106 +171,132 @@ class ident_switch extends rcube_plugin
 			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']);
+				$q = $rc->db->query($sql, $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']);
+			$args['smtp_user'] = $r['username'];
+			$args['smtp_pass'] = $r['smtp_auth'] == self::SMTP_AUTH_IMAP ? $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'];
+			}
 		}
 
 		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),
+			$prefix . 'delimiter' => array('type' => 'text', 'size' => 1, 'placeholder' => '.'),
+		);
+	}
+
+	private function get_smtp_form(&$record)
+	{
+		$prefix = 'ident_switch.form.smtp.';
+
+		$authType = new html_select(array('name' => "_{$prefix}auth"));
+		$authType->add($this->gettext('form.smtp.auth.imap'), self::SMTP_AUTH_IMAP);
+		$authType->add($this->gettext('form.smtp.auth.none'), self::SMTP_AUTH_NONE);
+
+		return array(
+			$prefix . 'host' => array('type' => 'text', 'size' => 64, 'placeholder' => 'localhost'),
+			$prefix . 'port' => array('type' => 'text', 'size' => 5, 'placeholder' => 587),
+			$prefix . 'auth' => array('value' => $authType->show(array($record['ident_switch.form.smtp.auth']))),
+		);
+	}
+
 	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;
+			return $args;
 
 		$this->add_texts('localization');
 
-		// Load data if exists
+		$row = null;
 		if (isset($args['record']['identity_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'] & self::DB_ENABLED)
-					$args['record']['ident_switch.form.enabled'] = true;
-				if ($r['flags'] & self::DB_SECURE_TLS) // TLS has priority
-					$args['record']['ident_switch.form.secure'] = 'tls';
-				elseif ($r['flags'] & self::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);
 		}
 
-		// 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'),
-		);
+		$record = &$args['record'];
 
-		// Process fields
-		$addAfter = '';
-		$table = new html_table(array('cols' => 2));
-		foreach ($fieldset as $col => $colprop)
+		// Load data if exists
+		if ($row)
 		{
-			$data = $args['record'][$col];
-			if ($colprop['type'] == 'hidden')
-			{
-				$addAfter .= rcube_output::get_edit_field($col, $data, $colprop, $colprop['type']);
-			}
-			else
-			{
-				$colprop['id'] = 'rcmfd_' . $col;
+			$dbToForm = array(
+				'label' => 'common.label',
+				'imap_host' => 'imap.host',
+				'imap_port' => 'imap.port',
+				'imap_delimiter' => 'imap.delimiter',
+				'username' => 'imap.username',
+				'password' => 'imap.password',
+				'smtp_host' => 'smtp.host',
+				'smtp_port' => 'smtp.port',
+				'smtp_auth' => 'smtp.auth',
 
-				$label = $colprop['label'] ?: $this->gettext(str_replace('-', '', $col));
-                $value = $colprop['value'] ?: rcube_output::get_edit_field($col, $data, $colprop, $colprop['type']);
+			);
+			foreach ($row as $k => $v)
+				$record['ident_switch.form.' . $dbToForm[$k]] = $v;
 
-				$table->add('title', html::label($colprop['id'], rcube::Q($label)));
-                $table->add(null, $value);
+			// 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);
 
-		// 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
+		$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' => $this->get_smtp_form($record)
 		);
 
 		return $args;
@@ -277,10 +310,9 @@ class ident_switch extends rcube_plugin
 		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
 			return $args;
 
-		// Process boolean fields
-		if (!rcube_utils::get_input_value('_ident_switch_form_enabled', rcube_utils::INPUT_POST))
+		if (!self::get_field_value('common', 'enabled', false))
 		{
-			self::sw_imap_off($args['iid']);
+			self::sw_imap_off($args['id']);
 			return $args;
 		}
 
@@ -307,8 +339,7 @@ class ident_switch extends rcube_plugin
 		if (strcasecmp($args['record']['email'], $rc->user->data['username']) === 0)
 			return $args;
 
-		// Process boolean fields
-		if (!rcube_utils::get_input_value('_ident_switch_form_enabled', rcube_utils::INPUT_POST))
+		if (!self::get_field_value('common', 'enabled', false))
 				return $args;
 
 		$data = self::check_field_values();
@@ -337,7 +368,7 @@ class ident_switch extends rcube_plugin
 
 		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'] . '.');
+			self::write_log("Object with ident_switch values not found in session for ID = {$args['id']}.");
 		else
 		{
 			$data['id'] = $args['id'];
@@ -355,7 +386,7 @@ class ident_switch extends rcube_plugin
 		$q = $rc->db->query($sql, $args['id'], $rc->user->ID);
 
 		if ($rc->db->affected_rows($q))
-			self::write_log('Deleted associated information for identity with ID = ' . $args['id'] . '.');
+			self::write_log("Deleted associated information for identity with ID = {$args['id']}.");
 
 		return $args;
 	}
@@ -368,44 +399,161 @@ class ident_switch extends rcube_plugin
 			if (strcasecmp($_SESSION['username'], $rc->user->data['username']) !== 0)
 			{
 				if (isset($_SESSION['iid' . self::MY_POSTFIX]))
-					$rc->output->add_script('plugin_switchIdent_fixIdent(' . $_SESSION['iid' . self::MY_POSTFIX] . ');', 'docready');
+				{
+					$iid = $_SESSION['iid' . self::MY_POSTFIX];
+					$rc->output->add_script("plugin_switchIdent_fixIdent({$iid});", 'docready');
+				}
 				else
 					self::write_log('Special session variable with active identity ID not found.');
 			}
 		}
 	}
 
+	function on_special_folders_form($args)
+	{
+		$rc = rcmail::get_instance();
+
+		if (($args['section'] == 'folders') &&
+		    (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0))
+		{
+			$no_override = array_flip((array)$rc->config->get('dont_override'));
+			$onchange = "if ($(this).val() == 'INBOX') $(this).val('')";
+			$select = $rc->folder_selector(array('noselection' => '---',
+																					 'realnames' => true,
+																					 'maxlength' => 30,
+																					 'folder_filter' => 'mail',
+																					 'folder_rights' => 'w'));
+
+			$sql = 'SELECT label FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
+			$q = $rc->db->query($sql, $_SESSION['iid' . self::MY_POSTFIX], $rc->user->ID);
+			$r = $rc->db->fetch_assoc($q);
+			$args['blocks']['main']['name'] .= ' (' . ($r['label'] ? rcube::Q($rc->gettext('server')) . ': ' . $r['label'] : 'remote') . ')';
+
+			foreach (rcube_storage::$folder_types as $type)
+			{
+				if (isset($no_override[$type . '_mbox']))
+					continue;
+
+				$defaultKey = $type . '_mbox_default' . self::MY_POSTFIX;
+				$otherKey = $type . '_mbox' . self::MY_POSTFIX;
+				$selected = $_SESSION[$otherKey] ? $_SESSION[$otherKey] : $_SESSION[$defaultKey];
+				$attr = array('id' => '_' . $type . '_mbox', 'name' => '_' . $type . '_mbox', 'onchange' => $onchange);
+				$args['blocks']['main']['options'][$type . '_mbox']['content'] = $select->show($selected, $attr);
+			}
+		}
+
+		return $args;
+	}
+
+	function on_special_folders_update($args)
+	{
+		$rc = rcmail::get_instance();
+
+		if (($args['section'] == 'folders') &&
+		    (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0))
+		{
+			$sql = 'SELECT id FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE iid = ? AND user_id = ?';
+			$q = $rc->db->query($sql, $_SESSION['iid' . self::MY_POSTFIX], $rc->user->ID);
+			$r = $rc->db->fetch_assoc($q);
+			if ($r)
+			{
+				$sql = 'UPDATE ' .
+					$rc->db->table_name(self::TABLE) .
+					' SET drafts_mbox = ?, sent_mbox = ?, junk_mbox = ?, trash_mbox = ?' .
+					' WHERE id = ?';
+
+				$rc->db->query(
+					$sql,
+					$args['prefs']['drafts_mbox'],
+					$args['prefs']['sent_mbox'],
+					$args['prefs']['junk_mbox'],
+					$args['prefs']['trash_mbox'],
+					$r['id']
+				);
+
+				//abuse $plugin['abort'] to prevent RC main from saving prefs
+				$args['abort'] = true;
+				$args['result'] = true;
+
+				foreach (rcube_storage::$folder_types as $type)
+				{
+					if ($args['prefs'][$type . '_mbox']) {
+						$otherKey = $type . '_mbox' . self::MY_POSTFIX;
+						$_SESSION[$otherKey] = $args['prefs'][$type . '_mbox'];
+					}
+				}
+				return $args;
+			}
+
+			$args['abort'] = true;
+			$args['result'] = false;
+			return $args;
+		}
+
+		foreach (rcube_storage::$folder_types as $type)
+		{
+			if ($args['prefs'][$type . '_mbox']) {
+				$key = $type . '_mbox_default' . self::MY_POSTFIX;
+				$_SESSION[$key] = $args['prefs'][$type . '_mbox'];
+			}
+		}
+		return $args;
+	}
+
 	private static function check_field_values()
 	{
 		$retVal = array();
 
-		$retVal['label'] = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_label', rcube_utils::INPUT_POST));
+		$retVal['label'] = self::get_field_value('common', 'label');
 		if (strlen($retVal['label']) > 32)
 			$retVal['err'] = 'label.long';
 		else
 		{
-			$retVal['host'] = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_host', rcube_utils::INPUT_POST));
-			if (strlen($retVal['host']) > 64)
+			$retVal['imap.host'] = self::get_field_value('imap', 'host');
+			if (strlen($retVal['imap.host']) > 64)
 				$retVal['err'] = 'host.long';
 			else
 			{
-				$retVal['port'] = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_port', rcube_utils::INPUT_POST));
-				if ($retVal['port'] && !ctype_digit($retVal['port']))
+				$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['port'] && ($retVal['port'] <= 0 || $retVal['port'] > 65535))
+					if ($retVal['imap.port'] && ($retVal['imap.port'] <= 0 || $retVal['imap.port'] > 65535))
 						$retVal['err'] = 'port.range';
 					else
 					{
-						$retVal['user'] = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_username', rcube_utils::INPUT_POST));
-						if (strlen($retVal['user']) > 64)
-							$retVal['err'] = 'user.long';
+						$retVal['imap.delimiter'] = self::get_field_value('imap', 'delimiter');
+						if (strlen($retVal['imap.delimiter']) > 1)
+							$retVal['err'] = 'delim.long';
 						else
 						{
-							$retVal['delim'] = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_delimiter', rcube_utils::INPUT_POST));
-							if (strlen($retVal['delim']) > 1)
-								$retVal['err'] = 'delim.long';
+							$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';
+										else
+										{
+											$retVal['smtp.auth'] = self::get_field_value('smtp', 'auth');
+											if (!ctype_digit($retVal['smtp.auth']))
+												$retVal['err'] = 'auth.num';
+										}
+									}
+								}
+							}
 						}
 					}
 				}
@@ -413,19 +561,30 @@ class ident_switch extends rcube_plugin
 		}
 
 		// Get also password
-		$retVal['pass'] = rcube_utils::get_input_value('_ident_switch_form_password', rcube_utils::INPUT_POST);
+		$retVal['imap.pass'] = self::get_field_value('imap', 'password', false, true);
 
 		// Parse secure settings
 		$retVal['flags'] = self::DB_ENABLED;
-		$ssl = rcube_utils::get_input_value('_ident_switch_form_secure', rcube_utils::INPUT_POST);
-		if (strcasecmp($ssl, 'tls') === 0)
-			$retVal['flags'] |= self::DB_SECURE_TLS;
-		elseif (strcasecmp($ssl, 'ssl') === 0)
-			$retVal['flags'] |= self::DB_SECURE_SSL;
+
+		$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, $html = false)
+	{
+		$retVal = rcube_utils::get_input_value(
+			"_ident_switch_form_{$section}_{$field}",
+			rcube_utils::INPUT_POST,
+			$html
+		);
+		if (!$trim)
+			return $retVal;
+
+		return self::ntrim($retVal);
+	}
 
 	private static function save_field_values($rc, $data)
 	{
@@ -436,31 +595,34 @@ class ident_switch extends rcube_plugin
 		{ // Record already exists, will update it
 			$sql = 'UPDATE ' .
 				$rc->db->table_name(self::TABLE) .
-				' SET flags = ?, label = ?, host = ?, port = ?, username = ?, password = ?, delimiter = ?, user_id = ?, iid = ?' .
+				' SET flags = ?, label = ?, imap_host = ?, imap_port = ?, imap_delimiter = ?, username = ?, password = ?, smtp_host = ?, smtp_port = ?, smtp_auth = ?, 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, host, port, username, password, delimiter, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)';
+				'(flags, label, imap_host, imap_port, imap_delimiter, username, password, smtp_host, smtp_port, smtp_auth, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 		}
 
 		if ($sql)
 		{
 			// Do we need to update pwd?
-			if ($data['pass'] != $r['password'])
-				$data['pass'] = $rc->encrypt($data['pass']);
+			if ($data['imap.pass'] != $r['password'])
+				$data['imap.pass'] = $rc->encrypt($data['imap.pass']);
 
 			$rc->db->query(
 				$sql,
 				$data['flags'],
 				$data['label'],
-				$data['host'],
-				$data['port'],
-				$data['user'],
-				$data['pass'],
-				$data['delim'],
+				$data['imap.host'],
+				$data['imap.port'],
+				$data['imap.delimiter'],
+				$data['imap.user'],
+				$data['imap.pass'],
+				$data['smtp.host'],
+				$data['smtp.port'],
+				$data['smtp.auth'],
 				$rc->user->ID,
 				$data['id'],
 				$r['id']
@@ -479,6 +641,9 @@ class ident_switch extends rcube_plugin
 		$my_postfix_len = strlen(self::MY_POSTFIX);
 		$identId = rcube_utils::get_input_value('_ident-id', rcube_utils::INPUT_POST);
 
+		$rc->session->remove('folders');
+		$rc->session->remove('unseen_count');
+
 		if (-1 == $identId)
 		{ // Switch to main account
 			self::write_log('Switching mailbox back to default.');
@@ -496,10 +661,17 @@ class ident_switch extends rcube_plugin
 			$_SESSION['username'] = $rc->user->data['username'];
 			$_SESSION['password'] = $_SESSION['password' . self::MY_POSTFIX];
 			$_SESSION['iid' . self::MY_POSTFIX] = -1;
+
+			foreach (rcube_storage::$folder_types as $type)
+			{
+				$otherKey = $type . '_mbox' . self::MY_POSTFIX;
+				if ($_SESSION[$otherKey])
+					$rc->session->remove($otherKey);
+			}
 		}
 		else
 		{
-			$sql = 'SELECT host, flags, port, username, password, iid FROM ' . $rc->db->table_name(self::TABLE) . ' WHERE id = ? AND user_id = ?';
+			$sql = 'SELECT imap_host, flags, imap_port, imap_delimiter, drafts_mbox, sent_mbox, junk_mbox, trash_mbox, 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))
@@ -513,55 +685,67 @@ class ident_switch extends rcube_plugin
 					$r['username'] = $rIid['email'];
 				}
 
-				self::write_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!
-				$ssl = null;
-				if ($r['flags'] & self::DB_SECURE_TLS)
-				{
-					$ssl = 'tls';
-					$def_port = 143; // Default TLS port here!
-				}
-				elseif ($r['flags'] & self::DB_SECURE_SSL)
-				{
-					$ssl = 'ssl';
-					$def_port = 993; // Default SSL port here!
-				}
-
-				$port = $r['port'];
-				if (!$port)
-					$port = $def_port;
-
-				// If we are in default account now
-				// save everything with STORAGE
 				if ($_SESSION['username'] == $rc->user->data['username'])
-				{
+				{ // If we are in default account now - save values
 					foreach ($_SESSION as $k => $v)
 					{
 						if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, self::MY_POSTFIX, -$my_postfix_len, $my_postfix_len) !== 0)
 						{
 							if (!$_SESSION[$k . self::MY_POSTFIX])
 								$_SESSION[$k . self::MY_POSTFIX] = $_SESSION[$k];
-                            $rc->session->remove($k);
+
+							$rc->session->remove($k);
 						}
 					}
-				}
-				if (!$_SESSION['password' . self::MY_POSTFIX])
-					$_SESSION['password' . self::MY_POSTFIX] = $_SESSION['password'];
 
-				$_SESSION['storage_host'] = $r['host'] ? $r['host'] : 'localhost'; // Default host here!
+					$moreToSave = array('password', 'imap_delimiter');
+					foreach ($moreToSave as $k)
+					{
+						if (!$_SESSION[$k . self::MY_POSTFIX])
+							$_SESSION[$k . self::MY_POSTFIX] = $_SESSION[$k];
+
+						$rc->session->remove($k);
+					}
+				}
+
+				$def_port = 143; // Default IMAP port here!
+				$ssl = null;
+				if ($r['flags'] & self::DB_SECURE_IMAP_TLS)
+				{
+					$ssl = 'tls';
+					$def_port = 143; // Default IMAP TLS port here!
+				}
+				$port = $r['imap_port'] ? $r['imap_port'] : $def_port;
+
+				$host = $r['imap_host'] ? $r['imap_host'] : 'localhost'; // Default IMAP host here!
+				$hostProtocol = "{$ssl}://";
+				if ($ssl && strncasecmp($host, $hostProtocol, strlen($hostProtocol)) !== 0)
+					$host = $hostProtocol . $host;
+
+				$delimiter = $r['imap_delimiter'] ? $r['imap_delimiter'] : '.'; // Default delimiter here
+
+				$_SESSION['storage_host'] = $host;
 				$_SESSION['storage_ssl'] = $ssl;
 				$_SESSION['storage_port'] = $port;
+				$_SESSION['imap_delimiter'] = $delimiter;
 				$_SESSION['username'] = $r['username'];
 				$_SESSION['password'] = $r['password'];
 				$_SESSION['iid' . self::MY_POSTFIX] = $r['iid'];
 
-				$rc->session->remove('folders');
+				foreach (rcube_storage::$folder_types as $type)
+				{
+					if ($r[$type . '_mbox']) {
+						$otherKey = $type . '_mbox' . self::MY_POSTFIX;
+						$_SESSION[$otherKey] = $r[$type . '_mbox'];
+					}
+				}
 			}
 			else
 			{
 				// TODO: Show message in browser
-				self::write_log('Requested remote mailbox with ID = ' . $identId . ' not found.');
+				self::write_log("Requested remote mailbox with ID = {$identId} not found.");
 				return;
 			}
 		}
@@ -577,7 +761,7 @@ class ident_switch extends rcube_plugin
 	private static function sw_imap_off($iid)
 	{
 		$rc = rcmail::get_instance();
-		
+
 		$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);
 	}
@@ -607,21 +791,19 @@ class ident_switch extends rcube_plugin
 		$cfg = $this->get_preconfig($email);
 		if (is_array($cfg))
 		{
-			self::write_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'] = $record['ident_switch.form.smtp.host'] = $urlArr['host'] ? rcube::Q($urlArr['host'], 'url') : '';
+				$record['ident_switch.form.imap.port'] = $record['ident_switch.form.smtp.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;
@@ -630,11 +812,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;
 				}
@@ -642,13 +824,15 @@ 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;
 	}
 
 	private static function ntrim($str)

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 zwischen 1 und 65535 liegen.';

localization/en_US.inc

@@ -4,47 +4,73 @@
  */
 $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';
-
-// Username
-$labels['form.username'] = 'Username';
-
-// Password
-$labels['form.password'] = 'Password';
+$labels['form.imap.port'] = 'Port';
 
 // Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Folder hierarchy delimiter';
+$labels['form.imap.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).';
+// Username
+$labels['form.imap.username'] = 'Username';
 
-// 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).';
+// Password
+$labels['form.imap.password'] = 'Password';
 
-// 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 \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'Value in \'Username\' field 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.';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// 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.';
+// Server host name
+$labels['form.smtp.host'] = 'Server host name';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Secure connection (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Port';
+
+// Authorization
+$labels['form.smtp.auth'] = 'Authorization';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'As IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'None';
+
+
+// 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/fr_FR.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'] = 'Activé';
+$labels['form.common.enabled'] = 'Activer';
 
 // Label
-$labels['form.label'] = 'Nom d\'affichage';
+$labels['form.common.label'] = 'Nom à afficher';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'La valeur du champ \'Nom à afficher\' est trop longue (32 caractères max).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host']='Nom d\'hôte du serveur';
+$labels['form.imap.host'] = 'Serveur';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure']='Sécurité de la connexion';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Connexion sécurisée (TLS)';
 
 // Port
-$labels['form.port']='Port';
+$labels['form.imap.port'] = 'Port';
 
 // Username
-$labels['form.username'] = 'Nom d\'utilisateur';
+$labels['form.imap.username'] = 'Nom d\'utilisateur';
 
 // Password
-$labels['form.password'] = 'Mot de passe';
-
-// Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Délimiteur de la hiérarchie des dossiers';
-
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = 'La valeur du champ \'Nom d\'affichage\' de la section IMAP est trop longue (32 car. max).';
-
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = 'La valeur du champ \'Nom d\'hôte du serveur\' de la section IMAP est trop longue (64 car. max).';
+$labels['form.imap.password'] = 'Mot de passe';
 
 // Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = 'La valeur du champ \'Nom d\'utilisateur\' de la section IMAP est trop longue (64 car. max).';
+$labels['err.user.long'] = 'La valeur du champ \'Nom d\'utilisateur\' de la section IMAP est trop longue (64 caractères max).';
 
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = 'La valeur du champ \'Délimiteur de la hiérarchie des dossiers\' de la section IMAP est trop longue (1 car. max).';
 
-// Value in \'Port\' field of IMAP section must be a number.
-$labels['err.port.num'] = 'La valeur du champ \'Port\' de la section IMAP doit être un nombre.';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = 'La valeur du champ \'Port\' de la section IMAP doit être comprise entre 1 et 65535.';
+// Server host name
+$labels['form.smtp.host'] = 'Serveur';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Connexion sécurisée (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Port';
+
+// Authorization required
+$labels['form.smtp.auth'] = 'Autorisation requise';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = 'La valeur du champ \'Serveur\' est trop longue (64 caractères max).';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = 'La valeur du champ \'Port\' doit être un nombre.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = 'La valeur du champ \'Port\' doit être comprise entre 1 et 65535.';

localization/ru_RU.inc

@@ -4,47 +4,73 @@
  */
 $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'] = 'Порт';
-
-// Username
-$labels['form.username'] = 'Имя пользователя';
-
-// Password
-$labels['form.password'] = 'Пароль';
+$labels['form.imap.port'] = 'Порт';
 
 // Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Разделитель в иерархии папок';
+$labels['form.imap.delimiter'] = 'Разделитель в иерархии папок';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = '\'Название\' в разделе IMAP должно быть не длинее 32 символов.';
+// Username
+$labels['form.imap.username'] = 'Имя пользователя';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = '\'Адрес сервера\' в разделе IMAP должен быть не длинее 64 символов.';
+// Password
+$labels['form.imap.password'] = 'Пароль';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = '\'Имя пользователя\' в секции IMAP должно быть не длинее 64 символов.';
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = '\'Имя пользователя\' должно быть не длинее 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 должен быть числом.';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = '\'Порт\' в секции IMAP должен быть в диапазоне от 1 до 65535.';
+// Server host name
+$labels['form.smtp.host'] = 'Адрес сервера';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Безопасное подключение (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Порт';
+
+// Authorization
+$labels['form.smtp.auth'] = 'Авторизация';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Как IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Нет';
+
+
+// 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.';