X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=12a84601d58b6bf802a97a40bf09e7c48de6c46c;hb=74424a43ea5689ddeec0ab9a3d243125ba4f39e5;hp=7222eed933ae1f16fe911f4acfa5a09939c6e7db;hpb=bc104ef3568e8b4d88acef908a4b4eca51b5b3c6;p=squirrelmail.git

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 7222eed9..12a84601 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,6 +3,8 @@
     **  imap.php
     **
     **  This implements all functions that do general imap functions.
+    **
+    **  $Id$
     **/
 
    $imap_general_debug = false;
@@ -15,55 +17,70 @@
    function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
       global $color, $squirrelmail_language, $imap_general_debug;
 
-      $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);
-	  }
+      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();
+         }
+
 
-          $data[] = $read;
-	  $read = $read_next;
+         // 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);
+               $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 == false)
           return $data;
-	  
-      if ($response == "NO") {
+     
+      if ($response == 'NO') {
          // ignore this error from m$ exchange, it is not fatal (aka bug)
-         if (!ereg("command resulted in",$message)) { 
+         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.");
@@ -72,7 +89,7 @@
             echo $message . "</font><br>\n";
             exit;
          }
-      } else if ($response == "BAD") {
+      } else if ($response == 'BAD') {
          set_up_language($squirrelmail_language);
          echo "<br><b><font color=$color[2]>\n";
          echo _("ERROR : Bad or malformed request.");
@@ -93,7 +110,7 @@
       global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
 
       $imap_stream = fsockopen ($imap_server_address, $imap_port,
-         &$error_number, &$error_string, 15);
+         $error_number, $error_string, 15);
       $server_info = fgets ($imap_stream, 1024);
       
       // Decrypt the password
@@ -110,20 +127,20 @@
       }
 
       fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) . 
-         "\" \"" . quotemeta($password) . "\"\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message);
+         '" "' . quotemeta($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";
 	       if (is_array($read))
 	       {
@@ -147,13 +164,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>
@@ -200,12 +217,15 @@ function sqimap_capability($imap_stream, $capability) {
 
 	if (!is_array($sqimap_capabilities)) {
 		fputs ($imap_stream, "a001 CAPABILITY\r\n");
-		$read = sqimap_read_data($imap_stream, "a001", true, $a, $b);
+		$read = sqimap_read_data($imap_stream, 'a001', true, $a, $b);
 
 		$c = explode(' ', $read[0]);
 		for ($i=2; $i < count($c); $i++) {
-			list($k, $v) = explode('=', $c[$i]);
-			$sqimap_capabilities[$k] = ($v)?$v:TRUE;
+			$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];
@@ -234,41 +254,26 @@ function sqimap_get_delimiter ($imap_stream = false) {
 			   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);
+			$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))
 				{
-					list($_, $n, $_, $d) = explode('"', $v);
-					$pn[$n] = $d;
-				}
-/* OS: We don't need this code right now, it is for other_users and shared folders
-				if (eregi('^\( *\((.*)\) *\)', $data[2], $data2))
-					$on = $data2[1];
-				if (eregi('^\( *\((.*)\) *\)', $data[3], $data2))
-					$sn = $data2[1];
-				unset($data);
-				$ona = explode(')(', $on);
-				while (list($k, $v) = each($ona))
-				{
-					list($_, $n, $_, $d) = explode('"', $v);
-					$on[$n] = $d;
-				}
-				$sna = explode(')(', $sn);
-				while (list($k, $v) = each($sna))
-				{
-					list($_, $n, $_, $d) = explode('"', $v);
-					$sn[$n] = $d;
+                    $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], "\"");
+			$read = sqimap_read_data($imap_stream, '.', true, $a, $b);
+			$quote_position = strpos ($read[0], '"');
 			$sqimap_delimiter = substr ($read[0], $quote_position+1, 1);
 		}
 	}
@@ -281,7 +286,7 @@ function sqimap_get_delimiter ($imap_stream = false) {
     ******************************************************************************/
    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];
@@ -318,18 +323,18 @@ function sqimap_get_delimiter ($imap_stream = false) {
     **           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);
          }
       }
@@ -343,7 +348,7 @@ function sqimap_get_delimiter ($imap_stream = false) {
    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];
    }