Fixed a problem with sqimap_unseen_messages where some versions of UW

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index d322f30a2f1007135c5ad8dd50c11ccf49a1585a..d8bad0152fe63ba8ca36a465a435ca4b1e7a12cd 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * imap.php
+ * imap_general.php
  *
  * Copyright (c) 1999-2002 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
@@ -19,7 +19,7 @@ require_once('../functions/display_messages.php');
  *
  * Sets an unique session id in order to avoid simultanous sessions crash.
  *
- * @return     string  a 4 chars unique string
+ * @return  string  a 4 chars unique string
  */
 
 global $sqimap_session_id;
@@ -39,14 +39,14 @@ function sqimap_session_id() {
 function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
-    $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message);
+    $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message, $query );
     return $read;
 }
 
 function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message) {
     $sid = sqimap_session_id();
     fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
-    $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message);
+    $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query);
     return $read;
 }
 
@@ -58,7 +58,7 @@ function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &
  */
 
 function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
-                               &$response, &$message) {
+                               &$response, &$message, $query = '') {
     global $color, $squirrelmail_language;
 
     $read = '';
@@ -127,6 +127,15 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
                     $read = fgets ($imap_stream, $bufsize);
                     $data[] = $read;
                     $read = fgets ($imap_stream, $bufsize);
+                } else if (preg_match("/^\* BYE \[ALERT\](.*)/", $read, $regs)) {
+                    /*
+                        It seems that the IMAP server has coughed a lung up
+                        and hung up the connection.  Print any info we have
+                        and abort.
+                     */
+                    echo _("Please contact your system administrator and report the following error:") . "<br>\n";
+                    echo "$regs[1]";
+                    exit(0);
                 } else {
                     $data[] = $read;
                     $read = fgets ($imap_stream, $bufsize);
@@ -155,6 +164,8 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
             echo "<br><b><font color=$color[2]>\n" .
                  _("ERROR : Could not complete request.") .
                  "</b><br>\n" .
+                 _("Query:") .
+                 $query . '<br>' .
                  _("Reason Given: ") .
                  $message . "</font><br>\n";
             exit;
@@ -164,6 +175,8 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
         echo "<br><b><font color=$color[2]>\n" .
              _("ERROR : Bad or malformed request.") .
              "</b><br>\n" .
+             _("Query:") .
+             $query . '<br>' .
              _("Server responded: ") .
              $message . "</font><br>\n";
         exit;
@@ -172,9 +185,9 @@ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
     }
 }
 
-function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') {
 
-    $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+    $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message, $query);
     return $res[0];
 
 }
@@ -416,7 +429,13 @@ function sqimap_find_displayable_name ($string) {
 function sqimap_unseen_messages ($imap_stream, $mailbox) {
     //fputs ($imap_stream, sqimap_session_id() . " SEARCH UNSEEN NOT DELETED\r\n");
     $read_ary = sqimap_run_command ($imap_stream, "STATUS \"$mailbox\" (UNSEEN)", true, $result, $message);
-    ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs);
+    $i = 0;
+    while (isset($read_ary[$i])) {
+        if (ereg("UNSEEN ([0-9]+)", $read_ary[$i], $regs)) {
+            break;
+        }
+        $i++;
+    }
     return $regs[1];
 }