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

SQL/mysql.initial.sql

@@ -1,38 +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)
-		NOT NULL,
-	password
 		varchar(64),
-	host
+	`password`
 		varchar(64),
-	port
+	`imap_host`
+		varchar(64),
+	`imap_port`
 		int
-		CHECK(port > 0 AND port <= 65535),
+		CHECK(`imap_port` > 0 AND `imap_port` <= 65535),
-	delimiter
+	`imap_delimiter`
 		char(1),
-	label
+	`label`
 		varchar(32),
-	flags
+	`flags`
 		int
 		NOT NULL
 		DEFAULT 0,
-	UNIQUE KEY user_id_label (user_id, label),
+	`smtp_host`
-	CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+		varchar(64),
-	CONSTRAINT fk_identity_id FOREIGN KEY (iid) REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE,
+	`smtp_port`
-	PRIMARY KEY(id),
+		int
-	INDEX IX_ident_switch_user_id (user_id),
+		CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535),
-	INDEX IX_ident_switch_iid (iid)
+	`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

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

SQL/mysql/2018071600.sql

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

SQL/mysql/2018121800.sql

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

SQL/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

@@ -0,0 +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),
+	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/2016060200.sql

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

SQL/postgres/2018081600.sql

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

SQL/postgres/2018121800.sql

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

SQL/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

@@ -1,39 +1,40 @@
-CREATE TABLE ident_switch
+CREATE TABLE ident_switch
-(
+(
-	id
+	id
-		serial
+		integer
-		PRIMARY KEY,
+		PRIMARY KEY,
-	user_id
+	user_id
-		integer
+		integer
-		NOT NULL
+		NOT NULL
-		REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+		REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-	iid
+	iid
-		integer
+		integer
-		NOT NULL
+		NOT NULL
-		REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
+		REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
-		UNIQUE,
+		UNIQUE,
-	username
+	username
-		varchar(64)
+		varchar(64),
-		NOT NULL,
+	password
-	password
+		varchar(64),
-		varchar(64),
+	imap_host
-	host
+		varchar(64),
-		varchar(64),
+	imap_port
-	port
+		integer
-		integer
+		CHECK(imap_port > 0 AND imap_port <= 65535),
-		CHECK(port > 0 AND port <= 65535),
+    imap_delimiter
-	delimiter
+        char(1),
-		char(1),
+	label
-	label
+		varchar(32),
-		varchar(32),
+	flags
-	flags
+		integer
-		integer
+		NOT NULL
-		NOT NULL
+		DEFAULT(0),
-		DEFAULT(0),
+  smtp_host
-	UNIQUE (user_id, label)
+    varchar(64),
-);
+  smtp_port
-
+    integer
-CREATE INDEX
+    CHECK(smtp_port > 0 AND smtp_port <= 65535),
-	IX_ident_switch_user_id
+	UNIQUE (user_id, label)
-ON
+);
-	ident_switch(user_id);
+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",
+      "php": ">=5.3.0",
-        "roundcube/plugin-installer": ">=0.1.3"
+      "roundcube/plugin-installer": ">=0.1.3",
+      "ext-ctype": "*"
     },
 	"conflict": {
 		"elm/identity_smtp": "*"
@@ -30,7 +32,7 @@
 	},
 	"extra": {
 		"roundcube": {
-			"min-version": "1.1",
+			"min-version": "1.3",
 			"sql-dir": "SQL"
 		}
 	}

config.inc.php.dist

@@ -1,2 +1,29 @@
-<?php
+<?php
-
+
+/*
+ * Preconfigured settings for different mail domains.
+ * Appropriate set of values is searched by mapping domain of email (from identity) to array key.
+ */
+$rcmail_config['ident_switch.preconfig'] = array(
+
+	# Domain part of email address
+	'domain.tld' => array(
+
+		# Hostname, use ssl:// or tls:// notation if needed, for no security use imap:// (must always start with scheme).
+		# Required.
+		'host' => 'imap://mail.domain.tld',
+
+		# Login name, can be 'email' (full address from identity), 'mbox' (only mailbox part).
+		# Any other value is threated ad 'not specified' (default).
+		'user' => 'email',
+
+		# Are specified settings locked in interface or not.
+		# Default - false.
+		'readonly' => true
+	),
+
+	'another.tld' => array(
+		'host' => 'tls://mail.another.tld',
+		'user' => 'mbox',
+	),
+);

ident_switch-form.js

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

ident_switch-form.min.js

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

ident_switch-switch.js

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

ident_switch-switch.min.js

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

ident_switch.js

@@ -1,35 +0,0 @@
-/*
- * This is part of identity_imap plugin
- */
-
-$(function() {
-	var $truName = $('.topright .username');
-	if ($truName.size() > 0) {
-		$sw = $('#plugin-ident_switch-account');
-		if ($sw.size() > 0) {
-			$sw.prependTo('.topright');
-			$truName.hide();
-			$('#plugin-ident_switch-account').show();
-			console.log("Doing replace.");
-		}
-	}
-
-	var $enFld = $("INPUT[name='_ident_switch.form.enabled']");
-	if ($enFld.size() == 1)
-		$enFld.change();
-});
-
-function plugin_switchIdent_enabled_onChange(e) {
-	var $enFld = $("INPUT[name='_ident_switch.form.enabled']");
-	$("INPUT[name!='_ident_switch.form.enabled']", $enFld.parents("FIELDSET")).prop("disabled", !$enFld.is(":checked"));
-}
-
-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);
-}

localization/de_DE.inc

@@ -0,0 +1,67 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
+
+// Enabled
+$labels['form.common.enabled'] = 'Aktiviert';
+
+// Label
+$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.imap.host'] = 'Servername';
+
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Sichere Verbindung (TLS)';
+
+// Port
+$labels['form.imap.port'] = 'Port';
+
+// Username
+$labels['form.imap.username'] = 'Benutzername';
+
+// Password
+$labels['form.imap.password'] = 'Passwort';
+
+// 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).';
+
+
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
+
+// Server host name
+$labels['form.smtp.host'] = 'Servername';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Sichere Verbindung (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Port';
+
+// 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,50 +4,73 @@
  */
 $labels = array();
 
-// IMAP
+// Plugin ident_switch
-$labels['form.caption'] = 'IMAP';
+$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)
+// Secure connection (TLS)
-$labels['form.secure']='Secure connection (SSL/TLS)';
+$labels['form.imap.tls'] = 'Secure connection (TLS)';
 
 // Port
-$labels['form.port']='Port';
+$labels['form.imap.port'] = 'Port';
-
-// Username
-$labels['form.username'] = 'Username';
-
-// Passwotrd
-$labels['form.password'] = 'Password';
 
 // Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Folder hierarchy delimiter';
+$labels['form.imap.delimiter'] = 'Folder hierarchy delimiter';
 
-// \'Username\' field in IMAP section cannot be empty.
+// Username
-$labels['err.user.empty'] = '\'Username\' field in IMAP section cannot be empty.';
+$labels['form.imap.username'] = 'Username';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
+// Password
-$labels['err.label.long'] = 'Value in \'Label\' field of IMAP section is too long (32 chars max).';
+$labels['form.imap.password'] = 'Password';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
+// Value in \'Username\' field 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).';
+$labels['err.user.long'] = 'Value in \'Username\' field 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).
+// SMTP
-$labels['err.delim.long'] = 'Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).';
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Port\' field of IMAP section must be a number.
+// Server host name
-$labels['err.port.num'] = 'Value in \'Port\' field of IMAP section must be a number.';
+$labels['form.smtp.host'] = 'Server host name';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+// Secure connection (TLS)
-$labels['err.port.rtange'] = 'Value in \'Port\' field of IMAP section must be between 1 and 65535.';
+$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

@@ -0,0 +1,67 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
+
+// Enabled
+$labels['form.common.enabled'] = 'Activer';
+
+// Label
+$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.imap.host'] = 'Serveur';
+
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Connexion sécurisée (TLS)';
+
+// Port
+$labels['form.imap.port'] = 'Port';
+
+// Username
+$labels['form.imap.username'] = 'Nom d\'utilisateur';
+
+// Password
+$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 caractères max).';
+
+
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
+
+// 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/it_IT.inc

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// IMAP
+$labels['form.caption'] = 'IMAP';
+
+// Enabled
+$labels['form.enabled'] = 'Abilita';
+
+// Label
+$labels['form.label'] = 'Nome visualizzato';
+
+// Server host name
+$labels['form.host']='Nome del server';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure']='Sicurezza della connessione';
+
+// Port
+$labels['form.port']='Porta';
+
+// Username
+$labels['form.username'] = 'Username';
+
+// Password
+$labels['form.password'] = 'Password';
+
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Delimitatore gerarchico delle cartelle';
+
+// Value in \'Label\' field of IMAP section is too long (32 chars max).
+$labels['err.label.long'] = 'Il valore del campo \' Nome Visualizzato\' è troppo lungo. (massimo 32 caratteri).';
+
+// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
+$labels['err.host.long'] = 'Il valore del campo \'Nome del server\' della sezione IMAP è troppo lungo (massimo 64 caratteri).';
+
+// Value in \'Username\' field of IMAP section is too long (64 chars max).
+$labels['err.user.long'] = 'Il valore del campo \'Username\' della sezione IMAP  è troppo lungo (massimo 64 caratteri).';
+
+// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
+$labels['err.delim.long'] = 'Il valore del campo \'Delimitatore gerarchico delle cartelle\'  è troppo lungo  (massimo 1 carattere).';
+
+// Value in \'Port\' field of IMAP section must be a number.
+$labels['err.port.num'] = 'Il valore del campo \'Porta\' nella sezione IMAP deve essere un numero.';
+
+// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+$labels['err.port.range'] = 'Il valore del campo \'Porta\' nella sezione IMAP deve essere compreso tra i valori 1 e 65535.';

localization/nl_NL.inc

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// IMAP
+$labels['form.caption'] = 'IMAP';
+
+// Enabled
+$labels['form.enabled'] = 'Inschakelen';
+
+// Label
+$labels['form.label'] = 'Label';
+
+// Server host name
+$labels['form.host']='Servernaam';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure']='Beveiligingstype';
+
+// Port
+$labels['form.port']='Poortnummer';
+
+// Username
+$labels['form.username'] = 'Gebruikersnaam';
+
+// Password
+$labels['form.password'] = 'Wachtwoord';
+
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Map hiërarchie scheidingsteken';
+
+// Value in \'Label\' field of IMAP section is too long (32 chars max).
+$labels['err.label.long'] = 'De waarde in het veld \'Label\' is te lang! (maximaal 32 karakter is toegestaan).';
+
+// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
+$labels['err.host.long'] = 'De waarde in het veld \'Servernaam\' is te lang (maximaal 64 karakter is toegestaan).';
+
+// Value in \'Username\' field of IMAP section is too long (64 chars max).
+$labels['err.user.long'] = 'De waarde in het veld \'Gebruikersnaam\' is te lang! (maximaal 64 karakter is toegestaan).';
+
+// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
+$labels['err.delim.long'] = 'De waarde in het veld \'Map hiërarchie scheidingsteken\' is te lang! (maximaal 1 karakter is toegestaan).';
+
+// Value in \'Port\' field of IMAP section must be a number.
+$labels['err.port.num'] = 'De waarde in het veld \'Poortnummer\' moet een nummer zijn.';
+
+// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+$labels['err.port.range'] = 'De waarde in het veld \'Poortnummer\' moet tussen de 1 en 65535 zijn.';

localization/ru_RU.inc

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