- Escape \ in login (#1484614)

2 files changed, 3 insertions, 3 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 16cc1bbc1..d50c83278 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG RoundCube Webmail
 - Support for subfolders in default/protected folders (#1484665)
 - Disallowed delimiter in folder name (#1484803)
 - Support " and \ in folder names
+- Escape \ in login (#1484614)
 
 2008/05/29 (alec)
 ----------
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index a75362cfc..4aefbb6de 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -56,7 +56,7 @@
 		  optional resposne in iil_Connect()
 		- trim(chop()) replaced by trim()
 		- added iil_Escape() with support for " and \ in folder names
-		
+		- support \ character in username in iil_C_Login()
 
 ********************************************************/
 
@@ -304,8 +304,7 @@ function iil_C_Authenticate(&$conn, $user, $pass, $encChallenge) {
 
 function iil_C_Login(&$conn, $user, $password) {
 
-    $password = iil_Escape($password);  
-    fputs($conn->fp, "a001 LOGIN $user \"$password\"\r\n");
+    fputs($conn->fp, 'a001 LOGIN "'.iil_Escape($user).'" "'.iil_Escape($password)."\"\r\n");
 
     do {
         $line = iil_ReadReply($conn->fp);