Use identity from field. Thanx Daniel Haag.

Closes #44.

SQL/sqlite.initial.sql

@@ -21,19 +21,31 @@ CREATE TABLE ident_switch
 	imap_port
 		integer
 		CHECK(imap_port > 0 AND imap_port <= 65535),
-    imap_delimiter
+	imap_delimiter
-        char(1),
+		char(1),
 	label
 		varchar(32),
 	flags
 		integer
 		NOT NULL
 		DEFAULT(0),
-  smtp_host
+	smtp_host
-    varchar(64),
+		varchar(64),
-  smtp_port
+	smtp_port
-    integer
+		integer
-    CHECK(smtp_port > 0 AND smtp_port <= 65535),
+		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/sqlite/2020121600.sql

@@ -0,0 +1,92 @@
+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),
+	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);
+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,
+	smtp_port
+  )
+SELECT
+  id,
+  user_id,
+  iid,
+  username,
+  password,
+  imap_host,
+  imap_port,
+  label,
+  flags,
+  smtp_host,
+  smtp_port
+FROM
+  ident_switch_old;
+
+DROP TABLE
+  ident_switch_old;
+
+COMMIT;
+PRAGMA foreign_keys=on;

composer.json

@@ -5,11 +5,10 @@
 	"homepage": "https://bitbucket.org/BoresExpress/ident_switch",
 	"keywords": ["identity", "imap", "mail", "switch"],
     "license": "GPL-3.0+",
-    "version": "4.3.1",
     "authors": [
         {
             "name": "Boris Gulay",
-            "email": "boris@boressoft.ru",
+            "email": "boris@gulay.name",
             "role": "Developer"
         }
     ],

ident_switch.php

@@ -159,7 +159,20 @@ class ident_switch extends rcube_plugin
 	{
 		$iid = $_SESSION['iid' . self::MY_POSTFIX];
 		if (!is_numeric($iid) || $iid == -1)
-			return $args;
+		{
+			self::write_log('no identity switch is selected... trying to find related smtp server from the from header');
+			$requestFrom = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
+			if (empty($requestFrom)) {
+				self::write_log('no _from post parameter found... falling back to original default config');
+				return $args;
+			} else {
+				$iid = intval($requestFrom);
+				if ($iid == 0) {
+					self::write_log('falling back to original default config as _from post field is no integer: ' . $_POST['_from']); 
+					return $args;
+				}
+			}
+		}
 
 		$rc = rcmail::get_instance();
 
@@ -179,15 +192,15 @@ class ident_switch extends rcube_plugin
 
 			$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_host'] = $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)
+				if (strpos($args['smtp_host'], ':') !== false)
 					self::write_log('SMTP server already contains protocol, ignoring TLS flag.');
 				else
-					$args['smtp_server'] = 'tls://' . $args['smtp_server'];
+					$args['smtp_host'] = 'tls://' . $args['smtp_host'];
 			}
 		}
 

localization/sl_SI.inc

@@ -0,0 +1,76 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Razširitev ident_switch';
+
+// Enabled
+$labels['form.common.enabled'] = 'Omogočeno';
+
+// Label
+$labels['form.common.label'] = 'Oznaka';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'Število znakov v polju \'Oznaka\' presega maksimalno število znakov (max 32 znakov).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
+
+// Server host name
+$labels['form.imap.host'] = 'Ime oz. naslov IMAP strežnika';
+
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Varna povezava (TLS)';
+
+// Port
+$labels['form.imap.port'] = 'Vrata';
+
+// Folder hierarchy delimiter
+$labels['form.imap.delimiter'] = 'Ločilo hierarhije map';
+
+// Username
+$labels['form.imap.username'] = 'Uporabniško ime';
+
+// Password
+$labels['form.imap.password'] = 'Geslo';
+
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'Število znakov v polju \'Uporabniško ime\' presega maksimalno število znakov (max 64 znakov).';
+
+
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
+
+// Server host name
+$labels['form.smtp.host'] = 'Ime oz. naslov SMTP strežnika';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Varna povezava (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Vrata';
+
+// Authorization
+$labels['form.smtp.auth'] = 'Avtorizacija';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Tako kot IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Brez';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = 'Število znakov v polju \'Ime oz. naslov IMAP strežnika\' presega maksimalno število znakov (max 64 znakov).';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = 'Vrednost \'Vrata\' mora biti številka.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = 'Vrednost v polju \'Vrata\' mora biti med 1 in 65535.';