Changeset 994 in subversion

Timestamp:

Feb 2, 2008 12:50:06 PM (5 years ago)

Author:

till

Message:

• fixed #1484629
• some cs

File:

• trunk/roundcubemail/program/lib/imap.inc (modified) (3 diffs)

trunk/roundcubemail/program/lib/imap.inc

@@ -259 +259 @@
     
     // generate hash
-    $hash = md5(iil_xor($pass,$opad) . pack("H*",md5(iil_xor($pass, $ipad) . base64_decode($encChallenge))));
+    $hash  = iil_xor($pass,$opad);
+    $hash .= pack("H*",md5(iil_xor($pass, $ipad) . base64_decode($encChallenge)));
+    $hash  = md5($hash);
     
     // generate reply
-    $reply = base64_encode($user . ' ' . $hash);
+    $reply = base64_encode('"' . $user . '" "' . $hash . '"');
     
     // send result, get reply
-    fputs($conn->fp, $reply."\r\n");
+    fputs($conn->fp, $reply . "\r\n");
     $line = iil_ReadLine($conn->fp, 1024);
     
@@ -274 +276 @@
         return $conn->fp;
     }
-    $conn->error    .= 'Authentication for '.$user.' failed (AUTH): "';
+    $conn->error    .= 'Authentication for ' . $user . ' failed (AUTH): "';
     $conn->error    .= htmlspecialchars($line) . '"';
     $conn->errorNum  = -2;
@@ -499 +501 @@
         
                 if ($line[0] == "+") {
-                        $conn->message.='Got challenge: '.htmlspecialchars($line)."\n";
+                        $conn->message .= 'Got challenge: ' . htmlspecialchars($line)."\n";
+
                         //got a challenge string, try CRAM-5
                         $result = iil_C_Authenticate($conn, $user, $password, substr($line,2));
-                        $conn->message.= "Tried CRAM-MD5: $result \n";
+            
+                        $conn->message .= "Tried CRAM-MD5: $result \n";
                 } else {
-                        $conn->message.='No challenge ('.htmlspecialchars($line)."), try plain\n";
-                        $auth = "plain";
+                        $conn->message .='No challenge ('.htmlspecialchars($line)."), try plain\n";
+                        
+            $auth = 'plain';            
                 }
         }