X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_general.php;h=8e2dc16b2b9b9af100ea4d5fd50e7c1834618730;hp=02d94872d9d172c38b8c9eaa3179682c7a24fc1f;hb=80bb6546e5f0602d8c055df1f37b64ab030d6657;hpb=40ba4d36052da54f044e9b966ef7c60d16c21215

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 02d94872..8e2dc16b 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,36 +3,86 @@
     **  imap.php
     **
     **  This implements all functions that do general imap functions.
+    **
+    **  $Id$
     **/
 
+   $imap_general_debug = false;
+
    /******************************************************************************
     **  Reads the output from the IMAP stream.  If handle_errors is set to true,
     **  this will also handle all errors that are received.  If it is not set,
     **  the errors will be sent back through $response and $message
     ******************************************************************************/
    function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
-      global $color, $squirrelmail_language;
+      global $color, $squirrelmail_language, $imap_general_debug;
 
-      //$imap_general_debug = true;
-      $imap_general_debug = false;
+      $read = fgets($imap_stream, 9096);
 
-      $read = fgets ($imap_stream, 1024);
-		if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
-      $counter = 0;
-      while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
-         $data[$counter] = $read;
-         $read = fgets ($imap_stream, 1024);
-			if ($imap_general_debug) echo "<small><tt><font color=cc0000>$read</font></tt></small><br>";
-         $counter++;
+      if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+         $size = $regs[1];
+      } else {
+         $size = 0;
       }
       
+      $data = array();
+      $total_size = 0;
+      
+      $continue = true;
+      while ($continue) {
+         // Continue if needed for this single line
+         while (strpos($read, "\n") === false) {
+            $read .= fgets($imap_stream, 9096);
+         }
+         // For debugging purposes
+         if ($imap_general_debug) {
+            echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
+            flush();
+         }
+
+
+         // If we know the size, no need to look at the end parameters
+         if ($size > 0) {
+            if ($total_size == $size) {
+               $data[] = $read;
+               $read = fgets($imap_stream, 9096);
+               while (!ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
+                  $read = fgets($imap_stream, 9096);
+               }
+               $continue = false;
+            } else if ($total_size > $size) {
+               $difference = $total_size - $size;
+               $total_size = $total_size - strlen($read);
+               $read = substr ($read, 0, strlen($read)-$difference);
+               $data[] = $read;
+               $junk = fgets($imap_stream, 9096);
+               $continue = false;
+            } else {
+               $data[] = $read;
+               $read = fgets($imap_stream, 9096);
+            }
+            $total_size += strlen($read);
+         } else {
+            if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
+               $continue = false;
+            } else {
+               $data[] = $read;
+               $read = fgets ($imap_stream, 9096);
+            }
+         }
+      }
+
       $response = $regs[1];
       $message = trim($regs[2]);
       
-      if ($imap_general_debug) echo "--<br>";
+      if ($imap_general_debug) echo '--<br>';
 
-      if ($handle_errors == true) {
-         if ($response == "NO") {
+      if ($handle_errors == false)
+          return $data;
+     
+      if ($response == 'NO') {
+         // ignore this error from m$ exchange, it is not fatal (aka bug)
+         if (strstr($message, 'command resulted in') === false) {
             set_up_language($squirrelmail_language);
             echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Could not complete request.");
@@ -40,23 +90,20 @@
             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;
          }
+      } 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;
    }
    
-
-
-   
    /******************************************************************************
     **  Logs the user into the imap server.  If $hide is set, no error messages
     **  will be displayed.  This function returns the imap connection handle.
@@ -64,7 +111,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
@@ -80,24 +128,28 @@
          exit;
       }
 
-      fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message);
+      fputs ($imap_stream, "a001 LOGIN \"" . quoteIMAP($username) . 
+         '" "' . quoteIMAP($password) . "\"\r\n");
+      $read = sqimap_read_data ($imap_stream, 'a001', false, $response, $message);
 
       /** If the connection was not successful, lets see why **/
       if ($response != "OK") {
          if (!$hide) {
-            if ($response != "NO") {
+            if ($response != 'NO') {
                // "BAD" and anything else gets reported here.
                set_up_language($squirrelmail_language, true);
-               if ($response == "BAD")
+               if ($response == 'BAD')
                    printf (_("Bad request: %s")."<br>\r\n", $message);
                else
                    printf (_("Unknown error: %s") . "<br>\n", $message);
-               echo "<br>";
+               echo '<br>';
                echo _("Read data:") . "<br>\n";
-               foreach ($read as $line)
-               {
-                   echo htmlspecialchars($line) . "<br>\n";
+	       if (is_array($read))
+	       {
+                   foreach ($read as $line)
+                   {
+                       echo htmlspecialchars($line) . "<br>\n";
+		   }
                }
                exit;
             } else {
@@ -114,13 +166,13 @@
                
                ?>
                   <html>
-                     <body bgcolor=ffffff>
+                     <body bgcolor="ffffff">
                         <br>
                         <center>
-                        <table width=70% noborder bgcolor=ffffff align=center>
+                        <table width="70%" noborder bgcolor="ffffff" align="center">
                            <tr>
-                              <td bgcolor=dcdcdc>
-                                 <font color=cc0000>
+                              <td bgcolor="dcdcdc">
+                                 <font color="cc0000">
                                  <center>
                                  <?php echo _("ERROR") ?>
                                  </center>
@@ -161,35 +213,74 @@
       fputs ($imap_stream, "a001 LOGOUT\r\n");
    }
 
+function sqimap_capability($imap_stream, $capability) {
+	global $sqimap_capabilities;
+	global $imap_general_debug;
 
+	if (!is_array($sqimap_capabilities)) {
+		fputs ($imap_stream, "a001 CAPABILITY\r\n");
+		$read = sqimap_read_data($imap_stream, 'a001', true, $a, $b);
+
+		$c = explode(' ', $read[0]);
+		for ($i=2; $i < count($c); $i++) {
+			$cap_list = explode('=', $c[$i]);
+			if (isset($cap_list[1]))
+			    $sqimap_capabilities[$cap_list[0]] = $cap_list[1];
+			else
+ 			    $sqimap_capabilities[$cap_list[0]] = TRUE;
+		}
+	}
+	return $sqimap_capabilities[$capability];
+}
 
    /******************************************************************************
     **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
     ******************************************************************************/
-   function sqimap_get_delimiter ($imap_stream = false) {
-		global $optional_delimiter;
-		if (!$optional_delimiter) $optional_delimiter = "detect";
+function sqimap_get_delimiter ($imap_stream = false) {
+   global $imap_general_debug;
+   global $sqimap_delimiter;
+   global $optional_delimiter;
 
-		if (strtolower($optional_delimiter) == "detect") {
-      	fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
-      	$read = sqimap_read_data($imap_stream, ".", true, $a, $b);
-      	$quote_position = strpos ($read[0], "\"");
-      	$delim = substr ($read[0], $quote_position+1, 1);
-      	return $delim;
-		} else {
-			return $optional_delimiter;
-		}
-   
-   /* According to something that I can't find, this is supposed to work on all systems
-   
-      fputs ($imap_stream, "a001 NAMESPACE\r\n");
-      $read = sqimap_read_data($imap_stream, "a001", true, $a, $b);
-      eregi("\"\" \"(.)\"", $read[0], $regs);
-      return $regs[1];
-   */
+   /* Use configured delimiter if set */
+   if((!empty($optional_delimiter)) && $optional_delimiter != "detect") {
+      return $optional_delimiter;
    }
 
-
+	/* Do some caching here */
+    if (!$sqimap_delimiter) {
+		if (sqimap_capability($imap_stream, "NAMESPACE")) {
+			/* According to something that I can't find, this is supposed to work on all systems
+			   OS: This won't work in Courier IMAP.
+			   OS:  According to rfc2342 response from NAMESPACE command is:
+			   OS:  * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES)
+			   OS:  We want to lookup all personal NAMESPACES...
+			*/
+			fputs ($imap_stream, "a001 NAMESPACE\r\n");
+			$read = sqimap_read_data($imap_stream, 'a001', true, $a, $b);
+			if (eregi('\\* NAMESPACE +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL)', $read[0], $data)) {
+				if (eregi('^\\( *\\((.*)\\) *\\)', $data[1], $data2))
+					$pn = $data2[1];
+				$pna = explode(')(', $pn);
+				while (list($k, $v) = each($pna))
+				{
+                    $lst = explode('"', $v);
+                    if (isset($lst[3])) {
+                        $pn[$lst[1]] = $lst[3];
+                    } else {
+                        $pn[$lst[1]] = '';
+                    }
+				}
+			}
+			$sqimap_delimiter = $pn[0];
+		} else {
+			fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
+			$read = sqimap_read_data($imap_stream, '.', true, $a, $b);
+			$quote_position = strpos ($read[0], '"');
+			$sqimap_delimiter = substr ($read[0], $quote_position+1, 1);
+		}
+	}
+	return $sqimap_delimiter;
+}
 
 
    /******************************************************************************
@@ -197,7 +288,7 @@
     ******************************************************************************/
    function sqimap_get_num_messages ($imap_stream, $mailbox) {
       fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
+      $read_ary = sqimap_read_data ($imap_stream, 'a001', true, $result, $message);
       for ($i = 0; $i < count($read_ary); $i++) {
          if (ereg("[^ ]+ +([^ ]+) +EXISTS", $read_ary[$i], $regs)) {
 	    return $regs[1];
@@ -234,18 +325,18 @@
     **           becomes:   lkehresman@yahoo.com
     ******************************************************************************/
    function sqimap_find_displayable_name ($string) {
-      $string = " ".trim($string);
+      $string = ' '.trim($string);
       $orig_string = $string;
-      if (strpos($string, "<") && strpos($string, ">")) {
-         if (strpos($string, "<") == 1) {
+      if (strpos($string, '<') && strpos($string, '>')) {
+         if (strpos($string, '<') == 1) {
             $string = sqimap_find_email($string);
          } else {
             $string = trim($string);
-            $string = substr($string, 0, strpos($string, "<"));
-            $string = ereg_replace ("\"", "", $string);   
+            $string = substr($string, 0, strpos($string, '<'));
+            $string = ereg_replace ('"', '', $string);   
          }   
 
-         if (trim($string) == "") {
+         if (trim($string) == '') {
             $string = sqimap_find_email($orig_string);
          }
       }
@@ -259,7 +350,7 @@
    function sqimap_unseen_messages ($imap_stream, &$num_unseen, $mailbox) {
       //fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
       fputs ($imap_stream, "a001 STATUS \"$mailbox\" (UNSEEN)\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
+      $read_ary = sqimap_read_data ($imap_stream, 'a001', true, $result, $message);
       ereg("UNSEEN ([0-9]+)", $read_ary[0], $regs);
       return $regs[1];
    }