fixed quote problem, and added \r\n to imap message

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@324 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index d2812bdfb0bdb43c4215a9eb42f513ac920fc831..f047f3036d978b60a3ca2ec6f8a8e6b30fb010b0 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -201,7 +201,9 @@
          if (strpos($string, "<") == 1) {
             $string = sqimap_find_email($string);
          } else {
+            $string = trim($string);
             $string = substr($string, 0, strpos($string, "<"));
+            $string = ereg_replace ("\"", "", $string);   
          }   
       }
       return $string; 

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 0673787642140e02e92bcbf1739f6b71e2d3a205..f92a6184d07edc93602ac7bfd6bfdc7126e601cf 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -10,7 +10,7 @@
     ******************************************************************************/
    function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
       sqimap_mailbox_select ($imap_stream, $mailbox);
-      fputs ($imap_stream, "a001 EXPUNGE\n");
+      fputs ($imap_stream, "a001 EXPUNGE\r\n");
       $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -34,7 +34,7 @@
     **  Selects a mailbox
     ******************************************************************************/
    function sqimap_mailbox_select ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
       $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -48,7 +48,7 @@
          $dm = sqimap_get_delimiter($imap_stream);
          $mailbox = $mailbox.$dm;
       }
-      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
 
       sqimap_subscribe ($imap_stream, $mailbox);
@@ -60,7 +60,7 @@
     **  Subscribes to an existing folder 
     ******************************************************************************/
    function sqimap_subscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -71,7 +71,7 @@
     **  Unsubscribes to an existing folder 
     ******************************************************************************/
    function sqimap_unsubscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
    }
 
@@ -82,7 +82,7 @@
     **  This function simply deletes the given folder
     ******************************************************************************/
    function sqimap_mailbox_delete ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
       echo "mailbox: $mailbox<BR>";
       $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
       sqimap_unsubscribe ($imap_stream, $mailbox);
@@ -102,7 +102,7 @@
       
       $dm = sqimap_get_delimiter ($imap_stream);
 
-      fputs ($imap_stream, "a001 LIST \"\" INBOX\n");
+      fputs ($imap_stream, "a001 LIST \"\" INBOX\r\n");
       $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
       $g = 0;
       $phase = "inbox"; 
@@ -126,7 +126,7 @@
             $boxes[$g]["id"] = $g;
 
             /** Now lets get the flags for this mailbox **/
-            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\n"); 
+            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
             $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
 
             $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
@@ -141,7 +141,7 @@
 
          if (!$read_ary[$i+1]) {
             if ($phase == "inbox") {
-               fputs ($imap_stream, "a001 LSUB \"\" *\n");
+               fputs ($imap_stream, "a001 LSUB \"\" *\r\n");
                $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
                $phase = "lsub";
                $i--;

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 76b5cee3941c32d88e9453c224cc9fdbb09ca0f4..00357d62e5f4e905236e62f4c751e2b906140a39 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -9,7 +9,7 @@
     **  Copies specified messages to specified folder
     ******************************************************************************/
    function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
-      fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n");
+      fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
    }
 
@@ -31,7 +31,7 @@
     **  Sets the specified messages with specified flag
     ******************************************************************************/
    function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
-      fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\n");
+      fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
    }
 
@@ -39,7 +39,7 @@
     **  Returns some general header information -- FROM, DATE, and SUBJECT
     ******************************************************************************/
    function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
       for ($i = 0; $i < count($read); $i++) {
@@ -59,7 +59,7 @@
     **  Returns the flags for the specified messages 
     ******************************************************************************/
    function sqimap_get_flags ($imap_stream, $start, $end) {
-      fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\n");
+      fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
       $i = 0;
       while ($i < count($read)) {
@@ -94,7 +94,7 @@
     **  Wrapper function that reformats the header information.
     ******************************************************************************/
    function sqimap_get_message_header ($imap_stream, $id) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
      
       return sqimap_get_header($imap_stream, $read); 
@@ -283,7 +283,7 @@
     **  Returns the body of a message.
     ******************************************************************************/
    function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
        
       $i = 0;