Fix SMTP settings do not apply.

Closes #40, closes #51.
Thanx to sooslaca, J.P.

SQL/mysql.initial.sql

@@ -19,6 +19,8 @@ CREATE TABLE IF NOT EXISTS ident_switch
 	imap_port
 		int
 		CHECK(imap_port > 0 AND imap_port <= 65535),
+    imap_delimiter
+        char(1),
 	label
 		varchar(32),
 	flags

SQL/mysql/2019112000.sql

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

SQL/postgres.initial.sql

@@ -21,6 +21,8 @@ CREATE TABLE ident_switch
 	imap_port
 		integer
 		CHECK(imap_port > 0 AND imap_port <= 65535),
+	imap_delimiter
+	    char(1),
 	label
 		varchar(32),
 	flags

SQL/postgres/2019112000.sql

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

SQL/sqlite.initial.sql

@@ -21,6 +21,8 @@ CREATE TABLE ident_switch
 	imap_port
 		integer
 		CHECK(imap_port > 0 AND imap_port <= 65535),
+    imap_delimiter
+        char(1),
 	label
 		varchar(32),
 	flags

ident_switch.php

@@ -152,7 +152,7 @@ class ident_switch extends rcube_plugin
 	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();
@@ -207,6 +207,7 @@ class ident_switch extends rcube_plugin
 			$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' => '.'),
 		);
 	}
 
@@ -246,6 +247,7 @@ class ident_switch extends rcube_plugin
 				'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',
@@ -418,23 +420,29 @@ class ident_switch extends rcube_plugin
 						$retVal['err'] = 'port.range';
 					else
 					{
-						$retVal['imap.user'] = self::get_field_value('imap', 'username');
+						$retVal['imap.delimiter'] = self::get_field_value('imap', 'delimiter');
-						if (strlen($retVal['imap.user']) > 64)
+						if (strlen($retVal['imap.delimiter']) > 1)
-							$retVal['err'] = 'user.long';
+							$retVal['err'] = 'delim.long';
 						else
 						{
-							$retVal['smtp.host'] = self::get_field_value('smtp', 'host');
+							$retVal['imap.user'] = self::get_field_value('imap', 'username');
-							if (strlen($retVal['smtp.host']) > 64)
+							if (strlen($retVal['imap.user']) > 64)
-								$retVal['err'] = 'host.long';
+								$retVal['err'] = 'user.long';
 							else
 							{
-								$retVal['smtp.port'] = self::get_field_value('smtp', 'port');
+								$retVal['smtp.host'] = self::get_field_value('smtp', 'host');
-								if ($retVal['smtp.port'] && !ctype_digit($retVal['smtp.port']))
+								if (strlen($retVal['smtp.host']) > 64)
-									$retVal['err'] = 'port.num';
+									$retVal['err'] = 'host.long';
 								else
 								{
-									if ($retVal['smtp.port'] && ($retVal['smtp.port'] <= 0 || $retVal['smtp.port'] > 65535))
+									$retVal['smtp.port'] = self::get_field_value('smtp', 'port');
-										$retVal['err'] = 'port.range';
+									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';
+									}
 								}
 							}
 						}
@@ -478,14 +486,14 @@ class ident_switch extends rcube_plugin
 		{ // Record already exists, will update it
 			$sql = 'UPDATE ' .
 				$rc->db->table_name(self::TABLE) .
-				' SET flags = ?, label = ?, imap_host = ?, imap_port = ?, username = ?, password = ?, smtp_host = ?, smtp_port = ?, user_id = ?, iid = ?' .
+				' SET flags = ?, label = ?, imap_host = ?, imap_port = ?, imap_delimiter = ?, username = ?, password = ?, smtp_host = ?, smtp_port = ?, 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, imap_host, imap_port, username, password, smtp_host, smtp_port, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+				'(flags, label, imap_host, imap_port, imap_delimiter, username, password, smtp_host, smtp_port, user_id, iid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 		}
 
 		if ($sql)
@@ -500,6 +508,7 @@ class ident_switch extends rcube_plugin
 				$data['label'],
 				$data['imap.host'],
 				$data['imap.port'],
+				$data['imap.delimiter'],
 				$data['imap.user'],
 				$data['imap.pass'],
 				$data['smtp.host'],
@@ -542,7 +551,7 @@ class ident_switch extends rcube_plugin
 		}
 		else
 		{
-			$sql = 'SELECT imap_host, flags, imap_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, 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))
@@ -558,6 +567,29 @@ class ident_switch extends rcube_plugin
 
 				self::write_log("Switching mailbox to one for identity with ID = {$r['iid']} (username = '{$r['username']}').");
 
+				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);
+						}
+					}
+
+					$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)
@@ -567,30 +599,16 @@ class ident_switch extends rcube_plugin
 				}
 				$port = $r['imap_port'] ? $r['imap_port'] : $def_port;
 
-				// If we are in default account now
-				// save everything with STORAGE
-				if ($_SESSION['username'] == $rc->user->data['username'])
-				{
-					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);
-						}
-					}
-				}
-				if (!$_SESSION['password' . self::MY_POSTFIX])
-					$_SESSION['password' . self::MY_POSTFIX] = $_SESSION['password'];
-
 				$host = $r['imap_host'] ? $r['imap_host'] : 'localhost'; // Default IMAP host here!
 				if ($ssl)
 					$host = "{$ssl}://{$host}";
 
+				$delimiter = $r['delimiter'] ? $r['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'];

localization/en_US.inc

@@ -29,6 +29,9 @@ $labels['form.imap.tls'] = 'Secure connection (TLS)';
 // Port
 $labels['form.imap.port'] = 'Port';
 
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Folder hierarchy delimiter';
+
 // Username
 $labels['form.imap.username'] = 'Username';
 

localization/fr_FR.inc

@@ -4,47 +4,64 @@
  */
 $labels = array();
 
-// IMAP
+// Plugin ident_switch
-$labels['form.caption'] = 'IMAP';
+$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)
+// Secure connection (TLS)
-$labels['form.secure']='Sécurité de la connexion';
+$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';
+$labels['form.imap.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).';
 
 // 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.
+// SMTP
-$labels['err.port.num'] = 'La valeur du champ \'Port\' de la section IMAP doit être un nombre.';
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+// Server host name
-$labels['err.port.range'] = 'La valeur du champ \'Port\' de la section IMAP doit être comprise entre 1 et 65535.';
+$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

@@ -29,6 +29,9 @@ $labels['form.imap.tls'] = 'Безопасное подключение (TLS)';
 // Port
 $labels['form.imap.port'] = 'Порт';
 
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Разделитель в иерархии папок';
+
 // Username
 $labels['form.imap.username'] = 'Имя пользователя';