Added a much better fix for the IE/SSL problem. No security hazards

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index b8d0e8678b32994105a51e2c2fbb87407edf1d16..7222eed933ae1f16fe911f4acfa5a09939c6e7db 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -6,7 +6,6 @@
     **/
 
    $imap_general_debug = false;
-   //$imap_general_debug = false;
 
    /******************************************************************************
     **  Reads the output from the IMAP stream.  If handle_errors is set to true,
@@ -16,39 +15,71 @@
    function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
       global $color, $squirrelmail_language, $imap_general_debug;
 
-      $counter = 0;
-      do {
-          $data[$counter] = $read = fgets ($imap_stream, 9096);
-          if ($imap_general_debug) { echo "<small><tt><font color=cc0000>$read</font></tt></small><br>"; flush(); }
-          $counter++;
-      } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs));
+      $keep_going = true;
+      $read = fgets($imap_stream, 9096);
+      while ($keep_going)
+      {
+          // Continue if needed for this single line
+          while (strpos($read, "\n") === false)
+         {
+             $read .= fgets($imap_stream, 9096);
+         }
+         
+         if ($imap_general_debug)
+         {
+             echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
+             flush();
+         }
+
+          if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs))
+         {
+             // Test if this is really the last line.
+             // Very much a hack, but what else can I do?
+             socket_set_blocking($imap_stream, false);
+             $read_next = fgets($imap_stream, 2);
+             socket_set_blocking($imap_stream, true);
+             
+             if ($read_next == "")
+             {
+                 $keep_going = 0;
+             }
+         }
+         else
+         {
+             $read_next = fgets($imap_stream, 9096);
+         }
+
+          $data[] = $read;
+         $read = $read_next;
+      }
 
       $response = $regs[1];
       $message = trim($regs[2]);
       
       if ($imap_general_debug) echo "--<br>";
 
-      if ($handle_errors == true) {
-         if ($response == "NO") {
-            // ignore this error from m$ exchange, it is not fatal (aka bug)
-            if (!ereg("command resulted in",$message)) { 
-               set_up_language($squirrelmail_language);
-               echo "<br><b><font color=$color[2]>\n";
-               echo _("ERROR : Could not complete request.");
-               echo "</b><br>\n";
-               echo _("Reason Given: ");
-               echo $message . "</font><br>\n";
-               exit;
-            }
-         } else if ($response == "BAD") {
+      if ($handle_errors == false)
+          return $data;
+         
+      if ($response == "NO") {
+         // ignore this error from m$ exchange, it is not fatal (aka bug)
+         if (!ereg("command resulted in",$message)) { 
             set_up_language($squirrelmail_language);
             echo "<br><b><font color=$color[2]>\n";
-            echo _("ERROR : Bad or malformed request.");
+            echo _("ERROR : Could not complete request.");
             echo "</b><br>\n";
-            echo _("Server responded: ");
+            echo _("Reason Given: ");
             echo $message . "</font><br>\n";
             exit;
          }
+      } else if ($response == "BAD") {
+         set_up_language($squirrelmail_language);
+         echo "<br><b><font color=$color[2]>\n";
+         echo _("ERROR : Bad or malformed request.");
+         echo "</b><br>\n";
+         echo _("Server responded: ");
+         echo $message . "</font><br>\n";
+         exit;
       }
       
       return $data;
@@ -59,15 +90,14 @@
     **  will be displayed.  This function returns the imap connection handle.
     ******************************************************************************/
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
-      global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad, $otp_pad;
+      global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
 
       $imap_stream = fsockopen ($imap_server_address, $imap_port,
          &$error_number, &$error_string, 15);
       $server_info = fgets ($imap_stream, 1024);
       
       // Decrypt the password
-      $onetpad = OneTimePadDecrypt($onetimepad, $otp_pad);
-      $password = OneTimePadDecrypt($password, $onetpad);
+      $password = OneTimePadDecrypt($password, $onetimepad);
 
       /** Do some error correction **/
       if (!$imap_stream) {