possible fix for IE/SSL problem

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 1bbce301120e3eca55159686bdf6f441400c06b4..5e80c89cb8cfc8413fce3e81dd776c5fc42b9e30 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -18,7 +18,7 @@
 
       $counter = 0;
       do {
-          $data[$counter] = $read = fgets ($imap_stream, 4096);
+          $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));
@@ -30,13 +30,16 @@
 
       if ($handle_errors == true) {
          if ($response == "NO") {
-            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;
+            // 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") {
             set_up_language($squirrelmail_language);
             echo "<br><b><font color=$color[2]>\n";
@@ -58,7 +61,8 @@
    function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
       global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
 
-      $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
+      $imap_stream = fsockopen ($imap_server_address, $imap_port,
+         &$error_number, &$error_string, 15);
       $server_info = fgets ($imap_stream, 1024);
       
       // Decrypt the password