Dutch translation added. Thanx to Dave, closes #14.

config.inc.php.dist

@@ -1,2 +1,29 @@
 <?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.js

@@ -10,17 +10,35 @@ $(function() {
 			$sw.prependTo('.topright');
 			$truName.hide();
 			$('#plugin-ident_switch-account').show();
-			console.log("Doing replace.");
 		}
 	}
 
 	$("INPUT[name='_ident_switch.form.enabled']").change();
 	$("SELECT[name='_ident_switch.form.secure']").change();
+
+	plugin_switchIdent_processPreconfig();
 });
 
+function plugin_switchIdent_processPreconfig() {
+	var disFld = $("INPUT[name='_ident_switch.form.readonly']");
+	disFld.parentsUntil("TABLE", "TR").hide();
+
+	var disVal = disFld.val();
+	if (disVal > 0) {
+		$("INPUT[name='_ident_switch.form.host']").prop("disabled", true);
+		$("SELECT[name='_ident_switch.form.secure']").prop("disabled", true);
+		$("INPUT[name='_ident_switch.form.port']").prop("disabled", true);
+	}
+	if (2 == disVal) {
+		$("INPUT[name='_ident_switch.form.username']").prop("disabled", true);
+	}
+
+}
+
 function plugin_switchIdent_enabled_onChange(e) {
 	var $enFld = $("INPUT[name='_ident_switch.form.enabled']");
 	$("INPUT[name!='_ident_switch.form.enabled'], SELECT", $enFld.parents("FIELDSET")).prop("disabled", !$enFld.is(":checked"));
+	plugin_switchIdent_processPreconfig();
 }
 
 function plugin_switchIdent_secure_onChange(e) {
@@ -34,8 +52,7 @@ function plugin_switchIdent_secure_onChange(e) {
 }
 
 function plugin_switchIdent_switch(val) {
-	console.log("qwe1");
+	rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val, '_mbox': rcmail.env.mailbox });
-	rcmail.http_post('plugin.ident_switch.switch', { '_ident-id': val });
 }
 
 function  plugin_switchIdent_fixIdent(iid) {

ident_switch.min.js

@@ -0,0 +1,10 @@
+$(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();}}
+$("INPUT[name='_ident_switch.form.enabled']").change();$("SELECT[name='_ident_switch.form.secure']").change();plugin_switchIdent_processPreconfig();});function plugin_switchIdent_processPreconfig(){var disFld=$("INPUT[name='_ident_switch.form.readonly']");disFld.parentsUntil("TABLE","TR").hide();var disVal=disFld.val();if(disVal>0){$("INPUT[name='_ident_switch.form.host']").prop("disabled",true);$("SELECT[name='_ident_switch.form.secure']").prop("disabled",true);$("INPUT[name='_ident_switch.form.port']").prop("disabled",true);}
+if(2==disVal){$("INPUT[name='_ident_switch.form.username']").prop("disabled",true);}}
+function plugin_switchIdent_enabled_onChange(e){var $enFld=$("INPUT[name='_ident_switch.form.enabled']");$("INPUT[name!='_ident_switch.form.enabled'], SELECT",$enFld.parents("FIELDSET")).prop("disabled",!$enFld.is(":checked"));plugin_switchIdent_processPreconfig();}
+function plugin_switchIdent_secure_onChange(e){var $secSel=$("SELECT[name='_ident_switch.form.secure']");var $portFld=$("INPUT[name='_ident_switch.form.port']");if('SSL'===$secSel.val().toUpperCase())
+$portFld.attr("placeholder",993);else
+$portFld.attr("placeholder",143);}
+function plugin_switchIdent_switch(val){rcmail.http_post('plugin.ident_switch.switch',{'_ident-id':val,'_mbox':rcmail.env.mailbox});}
+function plugin_switchIdent_fixIdent(iid){if(parseInt(iid)>0)
+$("#_from").val(iid);}

ident_switch.php

@@ -37,9 +37,8 @@ class ident_switch extends rcube_plugin
 	function on_startup($args)
 	{
 		$rc = rcmail::get_instance();
-		error_log('Task: ' . $args['task'] . ', action: ' . $args['action']);
 
-		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 1)
+		if (strcasecmp($rc->user->data['username'], $_SESSION['username']) !== 0)
 		{ // We are impersonating
 			$rc->config->set('imap_cache', null);
 			$rc->config->set('messages_cache', false);
@@ -57,7 +56,6 @@ class ident_switch extends rcube_plugin
 	function on_render_page($args)
 	{
 		$rc = rcmail::get_instance();
-		error_log('Template: ' . $args['template']);
 
 		// Currently selected identity
 		$iid = $_SESSION['iid' . $this->my_postfix];
@@ -73,8 +71,8 @@ class ident_switch extends rcube_plugin
 		// Get list of alternative accounts
 		$sOpt = '';
 		$sql = 'SELECT id, iid, label, username FROM ' . $rc->db->table_name($this->table) . ' WHERE user_id = ? AND flags & ? > 0';
-		$q = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled);
+		$qRec = $rc->db->query($sql, $rc->user->data['user_id'], $this->db_enabled);
-		while ($r = $rc->db->fetch_assoc($q))
+		while ($r = $rc->db->fetch_assoc($qRec))
 		{
 			$opts = array('value' => $r['id']);
 			if ($iid_int == $r['iid'])
@@ -125,7 +123,7 @@ class ident_switch extends rcube_plugin
 				'select', 
 				array(
 					'id' => 'plugin-ident_switch-account',
-					'style' => 'display: none;',
+					'style' => 'display: none; padding: 0;',
 					'onchange' => 'plugin_switchIdent_switch(this.value);',
 				),
 				$sOpt
@@ -179,6 +177,7 @@ class ident_switch extends rcube_plugin
 				'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'),
 			),
 		);
 
@@ -200,8 +199,19 @@ class ident_switch extends rcube_plugin
 					$args['record']['ident_switch.form.secure'] = 'tls';
 				elseif ($r['flags'] & $this->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']);
+		}
 
 		return $args;
 	}
@@ -216,7 +226,7 @@ class ident_switch extends rcube_plugin
 
 		// Process boolean fields
 		$flags = 0;
-		if (get_input_value('_ident_switch_form_enabled', RCUBE_INPUT_POST))
+		if (rcube_utils::get_input_value('_ident_switch_form_enabled', rcube_utils::INPUT_POST))
 			$flags |= $this->db_enabled;
 
 		if (!($flags & $this->db_enabled))
@@ -228,17 +238,17 @@ class ident_switch extends rcube_plugin
 		// Check field values
 		$errMsg = '';
 
-		$fLabel = self::ntrim(get_input_value('_ident_switch_form_label', RCUBE_INPUT_POST));
+		$fLabel = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_label', rcube_utils::INPUT_POST));
 		if (strlen($fLabel) > 32)
 			$errMsg = 'label.long';
 		else
 		{
-			$fHost = self::ntrim(get_input_value('_ident_switch_form_host', RCUBE_INPUT_POST));
+			$fHost = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_host', rcube_utils::INPUT_POST));
 			if (strlen($fHost) > 64)
 				$errMsg = 'host.long';
 			else
 			{
-				$fPort = self::ntrim(get_input_value('_ident_switch_form_port', RCUBE_INPUT_POST));
+				$fPort = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_port', rcube_utils::INPUT_POST));
 				if ($fPort && !ctype_digit($fPort))
 					$errMsg = 'port.num';
 				else
@@ -247,12 +257,12 @@ class ident_switch extends rcube_plugin
 						$errMsg = 'port.range';
 					else
 					{
-						$fUser = self::ntrim(get_input_value('_ident_switch_form_username', RCUBE_INPUT_POST));
+						$fUser = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_username', rcube_utils::INPUT_POST));
 						if (strlen($fUser) > 64)
 							$errMsg = 'user.long';
 						else
 						{
-							$fDelim = self::ntrim(get_input_value('_ident_switch_form_delimiter', RCUBE_INPUT_POST));
+							$fDelim = self::ntrim(rcube_utils::get_input_value('_ident_switch_form_delimiter', rcube_utils::INPUT_POST));
 							if (strlen($fDelim) > 1)
 								$errMsg = 'delim.long';
 						}
@@ -270,7 +280,7 @@ class ident_switch extends rcube_plugin
 		}
 
 		// Parse secure settings
-		$ssl = get_input_value('_ident_switch_form_secure', RCUBE_INPUT_POST);
+		$ssl = rcube_utils::get_input_value('_ident_switch_form_secure', rcube_utils::INPUT_POST);
 		if (strcasecmp($ssl, 'tls') === 0)
 			$flags |= $this->db_secure_tls;
 		elseif (strcasecmp($ssl, 'ssl') === 0)
@@ -296,7 +306,7 @@ class ident_switch extends rcube_plugin
 		if ($sql)
 		{
 			// Do we need to update pwd?
-			$fPass = get_input_value('_ident_switch_form_password', RCUBE_INPUT_POST);
+			$fPass = rcube_utils::get_input_value('_ident_switch_form_password', rcube_utils::INPUT_POST);
 			if ($fPass != $r['password'])
 				$fPass = $rc->encrypt($fPass);
 
@@ -351,18 +361,20 @@ class ident_switch extends rcube_plugin
 		$rc = rcmail::get_instance();
 
 		$my_postfix_len = strlen($this->my_postfix);
-		$identId = rcube_utils::get_input_value('_ident-id', RCUBE_INPUT_POST);
+		$identId = rcube_utils::get_input_value('_ident-id', rcube_utils::INPUT_POST);
 
 		if (-1 == $identId)
 		{ // Switch to main account
 			$rc->write_log($this->my_log, 'Switching mailbox back to default.');
 
+			// Restore everything with STORAGE*my_postfix
 			foreach ($_SESSION as $k => $v)
 			{
 				if (strncasecmp($k, 'storage', 7) === 0 && substr_compare($k, $this->my_postfix, -$my_postfix_len, $my_postfix_len) === 0)
 				{
-					$_SESSION[$k] = $_SESSION[$k . $this->my_postfix];
+					$realKey = substr($k, 0, -$my_postfix_len);
-					$rc->session->remove($k . $this->my_postfix);
+					$_SESSION[$realKey] = $_SESSION[$k];
+					$rc->session->remove($k);
 				}
 			}
 			$_SESSION['username'] = $rc->user->data['username'];
@@ -444,7 +456,7 @@ class ident_switch extends rcube_plugin
 		$rc->output->redirect(
 			array(
 				'_task' => 'mail',
-				'_mbox' => rcube_utils::get_input_value('_mbox', RCUBE_INPUT_GET),
+				'_mbox' => 'INBOX',
 			)
 		);
 	}
@@ -457,6 +469,79 @@ class ident_switch extends rcube_plugin
 		$rc->db->query($sql, ~$this->db_enabled, $iid, $rc->user->ID);
 	}
 
+	protected function get_preconfig($email)
+	{
+		$dom = substr(strstr($email, '@'), 1);
+		if (!$dom)
+			return false;
+
+		//$this->load_config('config.inc.php.dist'); Don't need it yet
+		$this->load_config(); // config.inc.php
+
+		$cfg = rcmail::get_instance()->config->get('ident_switch.preconfig', array());
+		$cfg = $cfg[$dom];
+
+		if ($cfg)
+		{
+			if (!$cfg['host'])
+				return false; # Host must be specified!
+		}
+		return $cfg;
+	}
+
+	protected function apply_preconfig(&$record)
+	{
+		$email = $record['email'];
+		$cfg = $this->get_preconfig($email);
+		if (is_array($cfg))
+		{
+			rcmail::get_instance()->write_log(
+				$this->my_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']) : '';
+
+				if (strcasecmp('tls', $urlArr['scheme']) === 0)
+					$record['ident_switch.form.secure'] = 'tls';
+				elseif (strcasecmp('ssl', $urlArr['scheme']) === 0)
+					$record['ident_switch.form.secure'] = 'ssl';
+				else
+					$record['ident_switch.form.secure'] = '';
+			}
+
+			$loginSet = false;
+			if ($cfg['user'])
+			{ // Set up user name
+				switch (strtoupper($cfg['user']))
+				{
+				case 'EMAIL':
+					$record['ident_switch.form.username'] = $email;
+					$loginSet = true;
+					break;
+				case 'MBOX':
+					$record['ident_switch.form.username'] = strstr($email, '@', true);
+					$loginSet = true;
+					break;
+				}
+			}
+
+			if ($cfg['readonly'])
+			{
+				$record['ident_switch.form.readonly'] = 1;
+				if ($loginSet)
+					$record['ident_switch.form.readonly'] = 2;
+			}
+
+			return $cfg['readonly'];
+		}
+	}
+
 	protected static function ntrim($str)
 	{
 		if (is_null($str))

localization/de_DE.inc

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// IMAP
+$labels['form.caption'] = 'IMAP';
+
+// Enabled
+$labels['form.enabled'] = 'Aktiviert';
+
+// Label
+$labels['form.label'] = 'Bezeichnung';
+
+// Server host name
+$labels['form.host']='Servername';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure']='Verbindungssicherheit';
+
+// Port
+$labels['form.port']='Port';
+
+// Username
+$labels['form.username'] = 'Benutzername';
+
+// Password
+$labels['form.password'] = 'Passwort';
+
+// Folder hierarchy delimiter
+$labels['form.delimiter'] = 'Hierachietrennzeichen für Verzeichnisse';
+
+// 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).';
+
+// 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).';
+
+// 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).';
+
+// 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.';
+
+// 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.';

localization/en_US.inc

@@ -25,7 +25,7 @@ $labels['form.port']='Port';
 // Username
 $labels['form.username'] = 'Username';
 
-// Passwotrd
+// Password
 $labels['form.password'] = 'Password';
 
 // Folder hierarchy delimiter
@@ -47,4 +47,4 @@ $labels['err.delim.long'] = 'Value in \'Folder hierarchy delimiter\' field of IM
 $labels['err.port.num'] = 'Value in \'Port\' field of IMAP section must be a number.';
 
 // Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.rtange'] = '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.';

localization/fr_FR.inc

@@ -0,0 +1,50 @@
+<?php
+/*
+ * Localization file for ident_switch plugin
+ */
+$labels = array();
+
+// IMAP
+$labels['form.caption'] = 'IMAP';
+
+// Enabled
+$labels['form.enabled'] = 'Activé';
+
+// Label
+$labels['form.label'] = 'Nom d\'affichage';
+
+// Server host name
+$labels['form.host']='Nom d\'hôte du serveur';
+
+// Secure connection (SSL/TLS)
+$labels['form.secure']='Sécurité de la connexion';
+
+// Port
+$labels['form.port']='Port';
+
+// Username
+$labels['form.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).';
+
+// 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).';
+
+// 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.';
+
+// 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.';

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

@@ -25,7 +25,7 @@ $labels['form.port'] = 'Порт';
 // Username
 $labels['form.username'] = 'Имя пользователя';
 
-// Passwotrd
+// Password
 $labels['form.password'] = 'Пароль';
 
 // Folder hierarchy delimiter
@@ -47,4 +47,4 @@ $labels['err.delim.long'] = '\'Разделитель в иерархии пап
 $labels['err.port.num'] = '\'Порт\' в секции IMAP должен быть числом.';
 
 // Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.rtange'] = '\'Порт\' в секции IMAP должен быть в диапазоне от 1 до 65535.';
+$labels['err.port.range'] = '\'Порт\' в секции IMAP должен быть в диапазоне от 1 до 65535.';