X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=cdcb1c208b4caa8bbb2c86e67b9e88c89a1fbb59;hp=33b962b6f5f407aa6b1036e85452ac24bb287638;hb=2714d4ff9d44c2f27e413f49062247dc25558877;hpb=81fd63b6eeeee72624c24f837ff5beb3b08733a8

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 33b962b6..cdcb1c20 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,60 +1,115 @@
 <?php
 
 /**
- * imap_messages.php
- *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This implements functions that manipulate messages
- *
- * $Id$
- */
+* imap_messages.php
+*
+* Copyright (c) 1999-2004 The SquirrelMail Project Team
+* Licensed under the GNU GPL. For full terms see the file COPYING.
+*
+* This implements functions that manipulate messages
+* NOTE: Quite a few functions in this file are obsolete
+*
+* @version $Id$
+* @package squirrelmail
+* @subpackage imap
+*/
 
-/* Copies specified messages to specified folder */
+/**
+* Copies specified messages to specified folder
+* @param int $imap_stream The resource ID for the IMAP connection
+* @param string $start Beginning of range to copy
+* @param string $end End of the range to copy
+* @param string $mailbox Which box to copy to
+* @deprecated This function is obsolete and should not be used
+*/
 function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
-    $read = sqimap_run_command ($imap_stream, "COPY $start:$end \"$mailbox\"", true, $response, $message);
+    $read = sqimap_run_command ($imap_stream, "COPY $start:$end " . sqimap_encode_mailbox_name($mailbox), true, $response, $message, TRUE);
+}
+
+/**
+* copy a range of messages ($id) to another mailbox ($mailbox)
+* @param int $imap_stream The resource ID for the IMAP socket
+* @param string $id The list of messages to copy
+* @param string $mailbox The destination to copy to
+* @return void
+*/
+function sqimap_msgs_list_copy ($imap_stream, $id, $mailbox) {
+    $msgs_id = sqimap_message_list_squisher($id);
+    $read = sqimap_run_command ($imap_stream, "COPY $msgs_id " . sqimap_encode_mailbox_name($mailbox), true, $response, $message, TRUE);
+}
+
+/**
+* move a range of messages ($id) to another mailbox. Deletes the originals.
+* @param int $imap_stream The resource ID for the IMAP socket
+* @param string $id The list of messages to move
+* @param string $mailbox The destination to move to
+* @return void
+*/
+function sqimap_msgs_list_move ($imap_stream, $id, $mailbox) {
+    $msgs_id = sqimap_message_list_squisher($id);
+    $read = sqimap_run_command ($imap_stream, "COPY $msgs_id " . sqimap_encode_mailbox_name($mailbox), true, $response, $message, TRUE);
+    $read = sqimap_run_command ($imap_stream, "STORE $msgs_id +FLAGS (\\Deleted)", true, $response,$message, TRUE);
 }
 
-/* Deletes specified messages and moves them to trash if possible */
-function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
+
+/**
+* Deletes specified messages and moves them to trash if possible
+* @deprecated This function is obsolete and should no longer be used
+* @param int $imap_steam The resource ID for the IMAP connection
+* @param string $start Start of range
+* @param string $end End of range
+* @param string $mailbox Mailbox messages are being deleted from
+* @return void
+*/
+function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox, $bypass_trash=false) {
     global $move_to_trash, $trash_folder, $auto_expunge;
 
-    if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
+    if (($move_to_trash == true) && ($bypass_trash != true) &&
+        (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
         sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
     }
-    sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
+    sqimap_messages_flag ($imap_stream, $start, $end, "Deleted", true);
 }
 
-/* Sets the specified messages with specified flag */
-function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
-    $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", true, $response, $message);
+function sqimap_msgs_list_delete ($imap_stream, $mailbox, $id, $bypass_trash=false) {
+    global $move_to_trash, $trash_folder;
+    $msgs_id = sqimap_message_list_squisher($id);
+    if (($move_to_trash == true) && ($bypass_trash != true) &&
+        (sqimap_mailbox_exists($imap_stream, $trash_folder) &&  ($mailbox != $trash_folder)) ) {
+        $read = sqimap_run_command ($imap_stream, "COPY $msgs_id " . sqimap_encode_mailbox_name($trash_folder), true, $response, $message, TRUE);
+    }
+    $read = sqimap_run_command ($imap_stream, "STORE $msgs_id +FLAGS (\\Deleted)", true, $response, $message, TRUE);
 }
 
-/* Remove specified flag from specified messages */
-function sqimap_messages_remove_flag ($imap_stream, $start, $end, $flag) {
-    $read = sqimap_run_command ($imap_stream, "STORE $start:$end -FLAGS (\\$flag)", true, $response, $message);
+
+/**
+* Sets the specified messages with specified flag
+*/
+function sqimap_messages_flag ($imap_stream, $start, $end, $flag, $handle_errors) {
+    $read = sqimap_run_command ($imap_stream, "STORE $start:$end +FLAGS (\\$flag)", $handle_errors, $response, $message, TRUE);
 }
 
-/* Returns some general header information -- FROM, DATE, and SUBJECT */
-class small_header {
-    var $from = '', $subject = '', $date = '', $to = '', 
-        $priority = 0, $message_id = 0, $cc = '';
+function sqimap_toggle_flag($imap_stream, $id, $flag, $set, $handle_errors) {
+    $msgs_id = sqimap_message_list_squisher($id);
+    $set_string = ($set ? '+' : '-');
+    $read = sqimap_run_command ($imap_stream, "STORE $msgs_id ".$set_string."FLAGS ($flag)", $handle_errors, $response, $message, TRUE);
 }
 
+/** @deprecated */
 function sqimap_get_small_header ($imap_stream, $id, $sent) {
-    $res = sqimap_get_small_header_list($imap_stream, array($id), $sent);
+    $res = sqimap_get_small_header_list($imap_stream, $id, $sent);
     return $res[0];
 }
 
-/*
- * Sort the message list and crunch to be as small as possible
- * (overflow could happen, so make it small if possible)
- */
+/**
+* Sort the message list and crunch to be as small as possible
+* (overflow could happen, so make it small if possible)
+*/
 function sqimap_message_list_squisher($messages_array) {
     if( !is_array( $messages_array ) ) {
-        return;
+        return $messages_array;
     }
+
     sort($messages_array, SORT_NUMERIC);
     $msgs_str = '';
     while ($messages_array) {
@@ -71,113 +126,180 @@ function sqimap_message_list_squisher($messages_array) {
             $msgs_str .= ':' . $end;
         }
     }
-
     return $msgs_str;
 }
 
-/* returns the references header lines */
-function get_reference_header ($imap_stream, $message) {
-    $responses = array ();
-    $sid = sqimap_session_id();
-	$results = array();
-	$references = "";
-    $query = "$sid FETCH $message BODY[HEADER.FIELDS (References)]\r\n";
-    fputs ($imap_stream, $query);
-	$responses = sqimap_read_data_list($imap_stream, $sid, true, $responses, $message);
-    if (!eregi("^\\* ([0-9]+) FETCH", $responses[0][0], $regs)) {
-	    $responses = array ();
-	}
-	return $responses;
-}
-
+/**
+* Retrieves an array with a sorted uid list. Sorting is done on the imap server
+*
+* @param resource $imap_stream IMAP socket connection
+* @param string $sSortField Field to sort on
+* @param bool $reverse Reverse order search
+* @return array $id sorted uid list
+*/
+function sqimap_get_sort_order ($imap_stream, $sSortField,$reverse) {
+    global  $default_charset,
+            $sent_folder;
 
-/* get sort order from server and
- * return it as the $id array for
- * mailbox_display
- */
- 
-function sqimap_get_sort_order ($imap_stream, $sort) {
-    global  $default_charset, $thread_sort_messages,
-            $internal_date_sort, $server_sort_array,
-            $sent_folder, $mailbox;
-            
-    if (session_is_registered('server_sort_array')) {
-        session_unregister('server_sort_array');
-    }
-    if ($sort == 6) {
-        $qty = sqimap_get_num_messages ($imap_stream, $mailbox);
-        $server_sort_array = range(1, $qty);
-        session_register('server_sort_array');
-        return $server_sort_array;
-    }
-    $sid = sqimap_session_id();
-    $sort_on = array();
-    $reverse = 0;
-    $server_sort_array = array();
+    $id = array();
     $sort_test = array();
     $sort_query = '';
-    $sort_on = array (0=> 'DATE',
-                      1=> 'DATE',
-                      2=> 'FROM',
-                      3=> 'FROM',
-                      4=> 'SUBJECT',
-                      5=> 'SUBJECT');
-    if ($internal_date_sort == true) {
-        $sort_on[0] = 'ARRIVAL';
-        $sort_on[1] = 'ARRIVAL';
-    }
-    if ($sent_folder == $mailbox) {
-        $sort_on[2] = 'TO';
-        $sort_on[3] = 'TO';
-    }
-    if (!empty($sort_on[$sort])) {
-        $sort_query = "$sid SORT ($sort_on[$sort]) ".strtoupper($default_charset)." ALL\r\n";
-        fputs($imap_stream, $sort_query);
-        $sort_test = sqimap_read_data($imap_stream, $sid, false, $response, $message);
+
+    if ($sSortField) {
+        if ($reverse) {
+            $sSortField = 'REVERSE '.$sSortField;
+        }
+        $query = "SORT ($sSortField) ".strtoupper($default_charset).' ALL';
+        $sort_test = sqimap_run_command ($imap_stream, $query, true, $response, $message, TRUE);
     }
     if (isset($sort_test[0])) {
-        if (preg_match("/^\* SORT (.+)$/", $sort_test[0], $regs)) {
-            $server_sort_array = preg_split("/ /", trim($regs[1]));
+        for ($i=0,$iCnt=count($sort_test);$i<$iCnt;++$i) {
+            if (preg_match("/^\* SORT (.+)$/", $sort_test[$i], $regs)) {
+                $id = preg_split("/ /", trim($regs[1]));
+            break;
+            }
         }
     }
-    if ($sort == 0 || $sort == 2 || $sort == 4) {
-       $server_sort_array = array_reverse($server_sort_array);
-    }
     if (!preg_match("/OK/", $response)) {
-	   $server_sort_array = 'no';
-	}
-    session_register('server_sort_array');
-    return $server_sort_array;
+        return false;
+    } else {
+        return $id;
+    }
 }
-	
-/* returns an indent array for printMessageinfo()
-   this represents the amount of indent needed (value)
-   for this message number (key)
+
+/**
+* Retrieves an array with a sorted uid list. Sorting is done by SquirrelMail
+*
+* @param resource $imap_stream IMAP socket connection
+* @param string $sSortField Field to sort on
+* @param bool $reverse Reverse order search
+* @return array $aUid sorted uid list
+*/
+function get_squirrel_sort ($imap_stream, $sSortField, $reverse = false) {
+    if ($sSortField != 'RFC822.SIZE' && $sSortField != 'INTERNALDATE') {
+        $msgs = sqimap_get_small_header_list($imap_stream, false, '*',
+                                      array($sSortField), array());
+    } else {
+        $msgs = sqimap_get_small_header_list($imap_stream, false, '*',
+                                      array(), array($sSortField));
+    }
+    $aUid = array();
+    $walk = false;
+    switch ($sSortField) {
+      // natcasesort section
+      case 'FROM':
+      case 'TO':
+      case 'CC':
+        if(!$walk) {
+            array_walk($msgs, create_function('&$v,&$k,$f',
+                '$v[$f] = (isset($v[$f])) ? $v[$f] : "";
+                 $addr = parseAddress($v[$f]);
+                 $v[$f] = ($addr[0][1]) ? decodeHeader($addr[0][1]):$addr[0][0];'),$sSortField);
+            $walk = true;
+        }
+        // nobreak
+      case 'SUBJECT':
+        if(!$walk) {
+            array_walk($msgs, create_function('&$v,&$k,$f',
+                '$v[$f] = (isset($v[$f])) ? $v[$f] : "";
+                 $v[$f] = strtolower(decodeHeader(trim($v[$f])));
+                 $v[$f] = (preg_match("/^(vedr|sv|re|aw|\[\w\]):\s*(.*)$/si", $v[$f], $matches)) ?
+                                    $matches[2] : $v[$f];'),$sSortField);
+            $walk = true;
+        }
+        foreach ($msgs as $item) {
+            $aUid[$item['ID']] = $item[$sSortField];
+        }
+        natcasesort($aUid);
+        $aUid = array_keys($aUid);
+        if ($reverse) {
+             $aUid = array_reverse($aUid);
+        }
+        break;
+        //  \natcasesort section
+      // sort_numeric section
+      case 'DATE':
+      case 'INTERNALDATE':
+        if(!$walk) {
+            array_walk($msgs, create_function('&$v,$k,$f',
+                '$v[$f] = (isset($v[$f])) ? $v[$f] : "";
+                 $v[$f] = getTimeStamp(explode(" ",$v[$f]));'),$sSortField);
+            $walk = true;
+        }
+        // nobreak;
+      case 'RFC822.SIZE':
+        if(!$walk) {
+            // redefine $sSortField to maintain the same namespace between
+            // server-side sorting and squirrelmail sorting
+            $sSortField = 'SIZE';
+        }
+        foreach ($msgs as $item) {
+            $aUid[$item['ID']] = (isset($item[$sSortField])) ? $item[$sSortField] : 0;
+        }
+        if ($reverse) {
+            arsort($aUid,SORT_NUMERIC);
+        } else {
+            asort($aUid, SORT_NUMERIC);
+        }
+        $aUid = array_keys($aUid);
+        break;
+        // \sort_numeric section
+      case 'UID':
+        $aUid = array_reverse($msgs);
+        break;
+    }
+    return $aUid;
+}
+
+/**
+* Returns an indent array for printMessageinfo()
+* This represents the amount of indent needed (value),
+* for this message number (key)
 */
 
-function get_parent_level ($imap_stream) {
-    global $sort_by_ref, $default_charset, $thread_new;
-        $parent = "";
-        $child = "";
-        $cutoff = 0;
-        
-    /* loop through the threads and take unwanted characters out 
-       of the thread string then chop it up 
+/*
+ * Notes for future work:
+ * indent_array should contain: indent_level, parent and flags,
+ * sibling notes ..
+ * To achieve that we  need to define the following flags:
+ * 0: hasnochildren
+ * 1: haschildren
+ * 2: is first
+ * 4: is last
+ * a node has sibling nodes if it's not the last node
+ * a node has no sibling nodes if it's the last node
+ * By using binary comparations we can store the flag in one var
+ *
+ * example:
+ * -1      par = 0, level = 0, flag = 1 + 2 + 4 = 7 (haschildren,   isfirst, islast)
+ *  \-2    par = 1, level = 1, flag = 0 + 2     = 2 (hasnochildren, isfirst)
+ *  |-3    par = 1, level = 1, flag = 1 + 4     = 5 (haschildren,   islast)
+ *   \-4   par = 3, level = 2, flag = 1 + 2 + 4 = 7 (haschildren,   isfirst, islast)
+ *     \-5 par = 4, level = 3, flag = 0 + 2 + 4 = 6 (hasnochildren, isfirst, islast)
+ */
+function get_parent_level ($thread_new) {
+    $parent = '';
+    $child  = '';
+    $cutoff = 0;
+
+    /*
+     * loop through the threads and take unwanted characters out
+     * of the thread string then chop it up
      */
     for ($i=0;$i<count($thread_new);$i++) {
         $thread_new[$i] = preg_replace("/\s\(/", "(", $thread_new[$i]);
         $thread_new[$i] = preg_replace("/(\d+)/", "$1|", $thread_new[$i]);
         $thread_new[$i] = preg_split("/\|/", $thread_new[$i], -1, PREG_SPLIT_NO_EMPTY);
-    } 
+    }
     $indent_array = array();
-        if (!$thread_new) {
-            $thread_new = array();
-        }
+    if (!$thread_new) {
+        $thread_new = array();
+    }
     /* looping through the parts of one message thread */
-    
+
     for ($i=0;$i<count($thread_new);$i++) {
-    /* first grab the parent, it does not indent */
-    
+        /* first grab the parent, it does not indent */
+
         if (isset($thread_new[$i][0])) {
             if (preg_match("/(\d+)/", $thread_new[$i][0], $regs)) {
                 $parent = $regs[1];
@@ -185,26 +307,27 @@ function get_parent_level ($imap_stream) {
         }
         $indent_array[$parent] = 0;
 
-    /* now the children, checking each thread portion for
-       ),(, and space, adjusting the level and space values
-       to get the indent level
-    */
+        /*
+         * now the children, checking each thread portion for
+         * ),(, and space, adjusting the level and space values
+         * to get the indent level
+         */
         $level = 0;
         $spaces = array();
         $spaces_total = 0;
         $indent = 0;
         $fake = FALSE;
-        for ($k=1;$k<(count($thread_new[$i]))-1;$k++) {
+        for ($k=1,$iCnt=count($thread_new[$i])-1;$k<$iCnt;++$k) {
             $chars = count_chars($thread_new[$i][$k], 1);
             if (isset($chars['40'])) {       /* testing for ( */
-                $level = $level + $chars['40'];
+                $level += $chars['40'];
             }
             if (isset($chars['41'])) {      /* testing for ) */
-                $level = $level - $chars['41'];
+                $level -= $chars['41'];
                 $spaces[$level] = 0;
                 /* if we were faking lets stop, this portion
-                   of the thread is over
-                */
+                 * of the thread is over
+                 */
                 if ($level == $cutoff) {
                     $fake = FALSE;
                 }
@@ -213,17 +336,17 @@ function get_parent_level ($imap_stream) {
                 if (!isset($spaces[$level])) {
                     $spaces[$level] = 0;
                 }
-                $spaces[$level] = $spaces[$level] + $chars['32'];
+                $spaces[$level] += $chars['32'];
             }
             for ($x=0;$x<=$level;$x++) {
                 if (isset($spaces[$x])) {
-                    $spaces_total = $spaces_total + $spaces[$x];
+                    $spaces_total += $spaces[$x];
                 }
             }
             $indent = $level + $spaces_total;
             /* must have run into a message that broke the thread
-               so we are adjusting for that portion
-            */
+             * so we are adjusting for that portion
+             */
             if ($fake == TRUE) {
                 $indent = $indent +1;
             }
@@ -231,638 +354,506 @@ function get_parent_level ($imap_stream) {
                 $child = $regs[1];
             }
             /* the thread must be broken if $indent == 0
-               so indent the message once and start faking it
-            */
+             * so indent the message once and start faking it
+             */
             if ($indent == 0) {
                 $indent = 1;
                 $fake = TRUE;
                 $cutoff = $level;
             }
             /* dont need abs but if indent was negative
-               errors would occur
-            */
-            $indent_array[$child] = abs($indent);
+             * errors would occur
+             */
+            $indent_array[$child] = ($indent < 0) ? 0 : $indent;
             $spaces_total = 0;
-        }    
+        }
     }
     return $indent_array;
 }
 
 
-/* returns an array with each element as a string
-   representing one message thread as returned by
-   the IMAP server
+/**
+* Returns an array with each element as a string representing one
+* message-thread as returned by the IMAP server.
 */
-
 function get_thread_sort ($imap_stream) {
-    global $thread_new, $sort_by_ref, $default_charset, $server_sort_array;
-    if (session_is_registered('thread_new')) {
-        session_unregister('thread_new');
+    global $thread_new, $sort_by_ref, $default_charset, $server_sort_array, $indent_array;
+    if (sqsession_is_registered('thread_new')) {
+        sqsession_unregister('thread_new');
+    }
+    if (sqsession_is_registered('indent_array')) {
+        sqsession_unregister('indent_array');
     }
-    if (session_is_registered('server_sort_array')) {
-        session_unregister('server_srot_array');
+    if (sqsession_is_registered('server_sort_array')) {
+        sqsession_unregister('server_sort_array');
     }
-    $sid = sqimap_session_id();
     $thread_temp = array ();
     if ($sort_by_ref == 1) {
         $sort_type = 'REFERENCES';
-    }
-    else {
+    } else {
         $sort_type = 'ORDEREDSUBJECT';
     }
-    $thread_query = "$sid THREAD $sort_type ".strtoupper($default_charset)." ALL\r\n";
-    fputs($imap_stream, $thread_query);
-    $thread_test = sqimap_read_data($imap_stream, $sid, false, $response, $message);
+    $query = "THREAD $sort_type ".strtoupper($default_charset)." ALL";
+    $thread_test = sqimap_run_command ($imap_stream, $query, true, $response, $message, TRUE);
     if (isset($thread_test[0])) {
-        if (preg_match("/^\* THREAD (.+)$/", $thread_test[0], $regs)) {
-            $thread_list = trim($regs[1]);
+        for ($i=0,$iCnt=count($thread_test);$i<$iCnt;++$i) {
+            if (preg_match("/^\* THREAD (.+)$/", $thread_test[$i], $regs)) {
+                $thread_list = trim($regs[1]);
+                break;
+            }
         }
-    }
-    else {
-       $thread_list = "";
+    } else {
+        $thread_list = "";
     }
     if (!preg_match("/OK/", $response)) {
-	   $server_sort_array = 'no';
-	   return $server_sort_array;
-	}
+        $server_sort_array = 'no';
+        return $server_sort_array;
+    }
     if (isset($thread_list)) {
         $thread_temp = preg_split("//", $thread_list, -1, PREG_SPLIT_NO_EMPTY);
     }
+
     $char_count = count($thread_temp);
     $counter = 0;
     $thread_new = array();
     $k = 0;
     $thread_new[0] = "";
-    for ($i=0;$i<$char_count;$i++) {
-            if ($thread_temp[$i] != ')' && $thread_temp[$i] != '(') {
-                    $thread_new[$k] = $thread_new[$k] . $thread_temp[$i];
-            }
-            elseif ($thread_temp[$i] == '(') {
-                    $thread_new[$k] .= $thread_temp[$i];
-                    $counter++;
-            }
-            elseif ($thread_temp[$i] == ')') {
-                    if ($counter > 1) {
-                            $thread_new[$k] .= $thread_temp[$i];
-                            $counter = $counter - 1;
-                    }
-                    else {
-                            $thread_new[$k] .= $thread_temp[$i];
-                            $k++;
-                            $thread_new[$k] = "";
-                            $counter = $counter - 1;
-                    }
+    /*
+     * parse the thread response into separate threads
+     *
+     * example:
+     *         [0] => (540)
+     *         [1] => (1386)
+     *         [2] => (1599 759 959 37)
+     *         [3] => (492 1787)
+     *         [4] => ((933)(1891))
+     *         [5] => (1030 (1497)(845)(1637))
+     */
+    for ($i=0,$iCnt=count($thread_temp);$i<$iCnt;$i++) {
+        if ($thread_temp[$i] != ')' && $thread_temp[$i] != '(') {
+                $thread_new[$k] = $thread_new[$k] . $thread_temp[$i];
+        } elseif ($thread_temp[$i] == '(') {
+                $thread_new[$k] .= $thread_temp[$i];
+                $counter++;
+        } elseif ($thread_temp[$i] == ')') {
+            if ($counter > 1) {
+                $thread_new[$k] .= $thread_temp[$i];
+                $counter = $counter - 1;
+            } else {
+                $thread_new[$k] .= $thread_temp[$i];
+                $k++;
+                $thread_new[$k] = "";
+                $counter = $counter - 1;
             }
+        }
     }
-    session_register('thread_new');
+    sqsession_register($thread_new, 'thread_new');
     $thread_new = array_reverse($thread_new);
+    /* place the threads after each other in one string */
     $thread_list = implode(" ", $thread_new);
     $thread_list = str_replace("(", " ", $thread_list);
     $thread_list = str_replace(")", " ", $thread_list);
     $thread_list = preg_split("/\s/", $thread_list, -1, PREG_SPLIT_NO_EMPTY);
     $server_sort_array = $thread_list;
-    session_register('server_sort_array');
+
+    $indent_array = get_parent_level ($thread_new);
+    sqsession_register($indent_array, 'indent_array');
+
+    sqsession_register($server_sort_array, 'server_sort_array');
     return $thread_list;
 }
 
+
 function elapsedTime($start) {
- $stop = gettimeofday();
- $timepassed =  1000000 * ($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
- return $timepassed;
+    $stop = gettimeofday();
+    $timepassed =  1000000 * ($stop['sec'] - $start['sec']) + $stop['usec'] - $start['usec'];
+    return $timepassed;
 }
 
-
-function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
-    global $squirrelmail_language, $color, $data_dir, $username, $imap_server_type;
-    $start = gettimeofday();
-    /* Get the small headers for each message in $msg_list */
-    $sid = sqimap_session_id();
-    $maxmsg = sizeof($msg_list);
-    $msgs_str = sqimap_message_list_squisher($msg_list);
-    $results = array();
-    $read_list = array();
-    /*
-     * We need to return the data in the same order as the caller supplied
-     * in $msg_list, but IMAP servers are free to return responses in
-     * whatever order they wish... So we need to re-sort manually
-     */
-    for ($i = 0; $i < sizeof($msg_list); $i++) {
-        $id2index[$msg_list[$i]] = $i;
+// only used in sqimap_get_small_header_list
+function parseString($read,&$i) {
+    $char = $read{$i};
+    $s = '';
+    if ($char == '"') {
+        $iPos = ++$i;
+        while (true) {
+            $iPos = strpos($read,'"',$iPos);
+            if (!$iPos) break;
+                if ($iPos && $read{$iPos -1} != '\\') {
+                    $s = substr($read,$i,($iPos-$i));
+                    $i = $iPos;
+                    break;
+                }
+                $iPos++;
+                if ($iPos > strlen($read)) {
+                    break;
+                }
+        }
+    } else if ($char == '{') {
+        $lit_cnt = '';
+        ++$i;
+        $iPos = strpos($read,'}',$i);
+        if ($iPos) {
+        $lit_cnt = substr($read, $i, $iPos - $i);
+        $i += strlen($lit_cnt) + 3; /* skip } + \r + \n */
+        /* Now read the literal */
+        $s = ($lit_cnt ? substr($read,$i,$lit_cnt): '');
+        $i += $lit_cnt;
+        /* temp bugfix (SM 1.5 will have a working clean version)
+            too much work to implement that version right now */
+        --$i;
+        } else { /* should never happen */
+            $i += 3; /* } + \r + \n */
+            $s = '';
+        }
+    } else {
+        return false;
     }
+    ++$i;
+    return $s;
+}
 
-    $internaldate = getPref($data_dir, $username, 'internal_date_sort');
-    if ($internaldate) {
-	$query = "$sid FETCH $msgs_str (FLAGS RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
+// only used in sqimap_get_small_header_list
+function parseArray($read,&$i) {
+    $i = strpos($read,'(',$i);
+    $i_pos = strpos($read,')',$i);
+    $s = substr($read,$i+1,$i_pos - $i -1);
+    $a = explode(' ',$s);
+    if ($i_pos) {
+        $i = $i_pos+1;
+        return $a;
     } else {
-	$query = "$sid FETCH $msgs_str (FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
-    }
-    fputs ($imap_stream, $query);
-    $readin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
-
-    foreach ($readin_list as $r) {
-        if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH/iAU",$r[0], $regs)) {
-            set_up_language($squirrelmail_language);
-            echo '<br><b><font color=$color[2]>' .
-                  _("ERROR : Could not complete request.") .
-                  '</b><br>' .
-                  _("Unknown response from IMAP server: ") . ' 1.' .
-                  $r[0] . "</font><br>\n";
-         
-	} else 	if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
-             set_up_language($squirrelmail_language);
-             echo '<br><b><font color=$color[2]>' .
-                  _("ERROR : Could not complete request.") .
-                  '</b><br>' .
-                  _("Unknown message number in reply from server: ") .
-                  $regs[1] . "</font><br>\n";
-        } else {
-    	    $read_list[$id2index[$regs[1]]] = $r;
-        }
+        return false;
     }
-    arsort($read_list);
-
-    $patterns = array (
-			"/^To:(.*)\$/AU",
-			"/^From:(.*)\$/AU",
-			"/^X-Priority:(.*)\$/AU",
-			"/^Cc:(.*)\$/AU",
-			"/^Date:(.*)\$/AU",
-			"/^Subject:(.*)\$/AU",
-			"/^Content-Type:(.*)\$/AU"
-		);
-    $regpattern = '';		
-
-    for ($msgi = 0; $msgi < $maxmsg; $msgi++) {
-        $subject = _("(no subject)");
-        $from = _("Unknown Sender");
-        $priority = 0;
-        $messageid = "<>";
-        $cc = "";
-        $to = "";
-        $date = "";
-        $type[0] = "";
-        $type[1] = "";
-        $inrepto = "";
-	$flag_seen = false;
-	$flag_answered = false;
-	$flag_deleted = false;
-	$flag_flagged = false;
-        $read = $read_list[$msgi];
-        $prevline = false;
-
-        foreach ($read as $read_part) {
-            //unfold multi-line headers
-            while ($prevline && strspn($read_part, "\t ") > 0) {
-               $read_part = substr($prevline, 0, -2) . ' ' . ltrim($read_part);
-            }
-	    $prev_line = $read_part;
-	    
-	    if ($read_part{0} == '*') {
-	        if ($internaldate) {
-		    if (preg_match ("/^.+INTERNALDATE\s+\"(.+)\".+/iUA",$read_part, $reg)) {
-                        $tmpdate = trim($reg[1]);
-                        $tmpdate = str_replace('  ',' ',$tmpdate);
-                        $tmpdate = explode(' ',$tmpdate);
-                        $date = str_replace('-',' ',$tmpdate[0]) . " " .
-                                $tmpdate[1] . " " .
-                                $tmpdate[2];
-                    }
-		}  
-		if (preg_match ("/^.+RFC822.SIZE\s+(\d+).+/iA",$read_part, $reg)) {
-		    $size = $reg[1];
-        	}
-    		if (preg_match("/^.+FLAGS\s+\((.*)\).+/iUA", $read_part, $regs)) {
-		    $flags = explode(' ',trim($regs[1]));
-		    foreach ($flags as $flag) {
-			$flag = strtolower($flag);
-			if ($flag == '\\seen') {
-			    $flag_seen = true;
-			} else if ($flag == '\\answered') {
-			    $flag_answered = true;
-			} else if ($flag == '\\deleted') {
-			    $flag_deleted = true;
-			} else if ($flag == '\\flagged') {
-			    $flag_flagged = true;
-			}
-		    }	          
-    		}
-	    } else {
-		$firstchar = $read_part{0};	    	
-		if ($firstchar == 'T') {
-		    $regpattern = $patterns[0];
-		    $id = 1;
-		} else if ($firstchar == 'F') {
-		    $regpattern = $patterns[1];
-		    $id = 2;
-		} else if ($firstchar == 'X') {
-		    $regpattern = $patterns[2];
-		    $id = 3;
-		} else if ($firstchar == 'C') {
-		    if (strtolower($read_part{1}) == 'c') {
-			$regpattern = $patterns[3];
-			$id = 4;
-		    } else if (strtolower($read_part{1}) == 'o') {
-			$regpattern = $patterns[6];
-			$id = 7;
-		    }	
-		} else if ($firstchar == 'D' && !$internaldate ) {
-		    $regpattern = $patterns[4];
-		    $id = 5;
-		} else if ($firstchar == 'S') {
-		    $regpattern = $patterns[5];
-		    $id = 6;
-		} else $regpattern = '';	     
-
-		if ($regpattern) {
-		    if (preg_match ($regpattern, $read_part, $regs)) {
-			switch ($id) {
-			    case 1:
-			      $to = $regs[1];
-			      break;
-			    case 2:
-			      $from = $regs[1];
-			      break;
-			    case 3:
-			      $priority = $regs[1];
-			      break;
-			    case 4:
-			      $cc = $regs[1];
-			      break;
-			    case 5:
-			      $date = $regs[1];
-			      break;
-			    case 6:
-            		      $subject = htmlspecialchars(trim($regs[1]));
-            		      if ($subject == "") {
-                		$subject = _("(no subject)");
-            		      }
-			      break;
-			    case 7:
-            		      $type = strtolower(trim($regs[1]));
-            		      if ($pos = strpos($type, ";")) {
-                		 $type = substr($type, 0, $pos);
-            		      }
-            		      $type = explode("/", $type);
-            		      if (!isset($type[1])) {
-                		  $type[1] = '';
-            		      }
-			      break;
-			    default:
-			      break;  
-			}
-		    }
-		}
-	    }
-
-	}
-        $header = new small_header;
-        if ($issent) {
-            $header->from = (trim($to) != '' ? $to : '(' ._("No To Address") . ')');
-        } else {
-            $header->from = $from;
-        }
-
-        $header->date = $date;
-        $header->subject = $subject;
-        $header->to = $to;
-        $header->priority = $priority;
-        $header->message_id = $messageid;
-        $header->cc = $cc;
-        $header->size = $size;
-        $header->type0 = $type[0];
-        $header->type1 = $type[1];
-	$header->flag_seen = $flag_seen;
-	$header->flag_answered = $flag_answered;
-	$header->flag_deleted = $flag_deleted;
-	$header->flag_flagged = $flag_flagged;
-	$header->inrepto = $inrepto;
-        $result[] = $header;
-    }
-//    echo 'processtime (us): ' . elapsedtime($start) .'<BR>';
-    return $result;
 }
 
+function sqimap_get_small_header_list ($imap_stream, $msg_list, $show_num=false,
+    $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'),
+    $aFetchItems = array('FLAGS', 'RFC822.SIZE', 'INTERNALDATE')) {
 
+    $messages = array();
+    $read_list = array();
 
-
-/* Returns the flags for the specified messages */
-function sqimap_get_flags ($imap_stream, $i) {
-    $read = sqimap_run_command ($imap_stream, "FETCH $i:$i FLAGS", true, $response, $message);
-    if (ereg('FLAGS(.*)', $read[0], $regs)) {
-        return explode(' ', trim(ereg_replace('[\\(\\)\\\\]', '', $regs[1])));
-    }
-    return array('None');
-}
-
-function sqimap_get_flags_list ($imap_stream, $msg_list) {
-    $msgs_str = sqimap_message_list_squisher($msg_list);
-    for ($i = 0; $i < sizeof($msg_list); $i++) {
-        $id2index[$msg_list[$i]] = $i;
+    if (array_search('UID',$aFetchItems,true) !== false) {
+        $bUidFetch = false;
+    } else {
+        $bUidFetch = true;
     }
-    $result_list = sqimap_run_command_list ($imap_stream, "FETCH $msgs_str FLAGS", true, $response, $message);
-    $result_flags = array();
 
-    for ($i = 0; $i < sizeof($result_list); $i++) {
-        if (eregi('^\* ([0-9]+).*FETCH.*FLAGS(.*)', $result_list[$i][0], $regs)
-          && isset($id2index[$regs[1]]) && count($id2index[$regs[1]])) {
-            $result_flags[$id2index[$regs[1]]] = explode(" ", trim(ereg_replace('[\\(\\)\\\\]', '', $regs[2])));
-        } else {
-            set_up_language($squirrelmail_language);
-            echo "<br><b><font color=$color[2]>\n" .
-                 _("ERROR : Could not complete request.") .
-                 "</b><br>\n" .
-                 _("Unknown response from IMAP server: ") .
-                 $result_list[$i][0] . "</font><br>\n";
-            exit;
+    /* Get the small headers for each message in $msg_list */
+    if ($show_num != '999999' && $show_num != '*' ) {
+        $msgs_str = sqimap_message_list_squisher($msg_list);
+        /*
+        * We need to return the data in the same order as the caller supplied
+        * in $msg_list, but IMAP servers are free to return responses in
+        * whatever order they wish... So we need to re-sort manually
+        */
+        if ($bUidFetch) {
+            for ($i = 0; $i < sizeof($msg_list); $i++) {
+                $messages["$msg_list[$i]"] = array();
+            }
         }
+    } else {
+        $msgs_str = '1:*';
     }
-    arsort($result_flags);
-    return $result_flags;
-}
-
-/*
- * Returns a message array with all the information about a message.  
- * See the documentation folder for more information about this array.
- */
-function sqimap_get_message ($imap_stream, $id, $mailbox) {
-    $header = sqimap_get_message_header($imap_stream, $id, $mailbox);
-    return sqimap_get_message_body($imap_stream, $header);
-}
-
-/* Wrapper function that reformats the header information. */
-function sqimap_get_message_header ($imap_stream, $id, $mailbox) {
-    $read = sqimap_run_command ($imap_stream, "FETCH $id:$id BODY[HEADER]", true, $response, $message);
-    $header = sqimap_get_header($imap_stream, $read); 
-    $header->id = $id;
-    $header->mailbox = $mailbox;
-    return $header;
-}
-
-/* Wrapper function that reformats the entity header information. */
-function sqimap_get_ent_header ($imap_stream, $id, $mailbox, $ent) {
-    $read = sqimap_run_command ($imap_stream, "FETCH $id:$id BODY[$ent.HEADER]", true, $response, $message);
-    $header = sqimap_get_header($imap_stream, $read); 
-    $header->id = $id;
-    $header->mailbox = $mailbox;
-    return $header;
-}
 
 
-/* Wrapper function that returns entity headers for use by decodeMime */
-/*
-function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
-    $header = sqimap_get_header($imap_stream, $read);
-    $type0 = $header["TYPE0"]; 
-    $type1 = $header["TYPE1"];
-    $bound = $header["BOUNDARY"];
-    $encoding = $header["ENCODING"];
-    $charset = $header["CHARSET"];
-    $filename = $header["FILENAME"];
-}
-
-/* function to get the mime headers */
-function sqimap_get_mime_ent_header ($imap_stream, $id, $mailbox, $ent) {
-    $read = sqimap_run_command ($imap_stream, "FETCH $id:$id BODY[$ent.MIME]", true, $response, $message);
-    $header = sqimap_get_header($imap_stream, $read); 
-    $header->id = $id;
-    $header->mailbox = $mailbox;
-    return $header;
-}
 
+    /*
+     * Create the query
+     */
 
-/* Queries the IMAP server and gets all header information. */
-function sqimap_get_header ($imap_stream, $read) {
-    global $where, $what;
+    $sFetchItems = '';
+    $query = "FETCH $msgs_str (";
+    if (count($aFetchItems)) {
+        $sFetchItems = implode(' ',$aFetchItems);
+    }
+    if (count($aHeaderFields)) {
+        $sHeaderFields = implode(' ',$aHeaderFields);
+        $sFetchItems .= ' BODY.PEEK[HEADER.FIELDS ('.$sHeaderFields.')]';
+    }
+    $query .= trim($sFetchItems) . ')';
 
-    $hdr = new msg_header();
+    $read_list = sqimap_run_command_list ($imap_stream, $query, true, $response, $message, $bUidFetch);
     $i = 0;
 
-    /* Set up some defaults */
-    $hdr->type0 = "text";
-    $hdr->type1 = "plain";
-    $hdr->charset = "us-ascii";
-
-    $read_fold = array();
-
-    while ($i < count($read)) {
-        /* unfold multi-line headers */
-	/* remember line for to, cc and bcc */
-    	$read_fold[] = $read[$i];
-	$folded = false;
-    	while (($i + 1 < count($read)) && (strspn($read[$i + 1], "\t ") > 0) ) {
-    	    if ($read[$i+1] != '') $read_fold[] = $read[$i+1];
-    	    $read[$i + 1] = substr($read[$i], 0, -2) . ' ' . ltrim($read[$i+1]);
-	    array_splice($read, $i, 1);
-	    $folded = true;
-    	}
-	if (!$folded) {
-	    $read_fold = array();
-	}
-
-        if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
-            $hdr->mime = true;
-            $i++;
+    foreach ($read_list as $r) {
+        // use unset because we do isset below
+        $read = implode('',$r);
+
+        /*
+            * #id<space>FETCH<space>(
+        */
+
+        /* extract the message id */
+        $i_space = strpos($read,' ',2);
+        $id = substr($read,2,$i_space-2);
+        $fetch = substr($read,$i_space+1,5);
+        if (!is_numeric($id) && $fetch !== 'FETCH') {
+            $msg['ERROR'] = $read; // htmlspecialchars should be done just before display. this is backend code
+            break;
         }
-        /* ENCODING TYPE */
-        else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") {
-            $hdr->encoding = strtolower(trim(substr($read[$i], 26)));
-            $i++;
-        }
-        /* CONTENT-TYPE */
-        else if (strtolower(substr($read[$i], 0, 13)) == "content-type:") {
-            $cont = strtolower(trim(substr($read[$i], 13)));
-            if (strpos($cont, ";")) {
-                $cont = substr($cont, 0, strpos($cont, ";"));
-            }
-
-            if (strpos($cont, "/")) {
-                $hdr->type0 = substr($cont, 0, strpos($cont, "/"));
-                $hdr->type1 = substr($cont, strpos($cont, "/")+1);
-            } else {
-                $hdr->type0 = $cont;
-            }
-
-            $line = $read[$i];
-            $i++;
-            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
-                str_replace("\n", "", $line);
-                str_replace("\n", "", $read[$i]);
-                $line = "$line $read[$i]";
-                $i++;
-            }
-
-            /* Detect the boundary of a multipart message */
-            if (eregi('boundary="([^"]+)"', $line, $regs)) {
-                $hdr->boundary = $regs[1];
-            }
-
-            /* Detect the charset */
-            if (strpos(strtolower(trim($line)), "charset=")) {
-                $pos = strpos($line, "charset=") + 8;
-                $charset = trim($line);
-                if (strpos($line, ";", $pos) > 0) {
-                    $charset = substr($charset, $pos, strpos($line, ";", $pos)-$pos);
+        $i = strpos($read,'(',$i_space+5);
+        $read = substr($read,$i+1);
+        $i_len = strlen($read);
+        $i = 0;
+        while ($i < $i_len && $i !== false) {
+            /* get argument */
+            $read = trim(substr($read,$i));
+            $i_len = strlen($read);
+            $i = strpos($read,' ');
+            $arg = substr($read,0,$i);
+            ++$i;
+            switch ($arg)
+            {
+            case 'UID':
+                $i_pos = strpos($read,' ',$i);
+                if (!$i_pos) {
+                    $i_pos = strpos($read,')',$i);
+                }
+                if ($i_pos) {
+                    $unique_id = substr($read,$i,$i_pos-$i);
+                    $i = $i_pos+1;
                 } else {
-                    $charset = substr($charset, $pos);
+                    break 3;
                 }
-                $charset = str_replace("\"", "", $charset);
-                $hdr->charset = $charset;
-            } else {
-                $hdr->charset = "us-ascii";
-            }
-	    /* Detect type in case of multipart/related */
-	    if (strpos(strtolower(trim($line)), "type=")) {
-		$pos = strpos($line, "type=") + 6;
-		$type = trim($line);
-                if (strpos($line, ";", $pos) > 0) {
-                    $type = substr($type, $pos, strpos($line, ";", $pos)-$pos);
+                break;
+            case 'FLAGS':
+                $flags = parseArray($read,$i);
+                if (!$flags) break 3;
+                $aFlags = array();
+                foreach ($flags as $flag) {
+                    $flag = strtolower($flag);
+                    $aFlags[$flag] = true;
+                }
+                $msg['FLAGS'] = $aFlags;
+                break;
+            case 'RFC822.SIZE':
+                $i_pos = strpos($read,' ',$i);
+                if (!$i_pos) {
+                    $i_pos = strpos($read,')',$i);
+                }
+                if ($i_pos) {
+                    $msg['SIZE'] = substr($read,$i,$i_pos-$i);
+                    $i = $i_pos+1;
                 } else {
-                    $type = substr($type, $pos);
+                    break 3;
                 }
-		$hdr->type = $type;
-	    }
-        }
-        else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {
-            /* Add better content-disposition support */
-            $line = $read[$i];
-            $i++;
-            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
-                str_replace("\n", "", $line);
-                str_replace("\n", "", $read[$i]);
-                $line = "$line $read[$i]";
-                $i++;
-            }
 
-            /* Detects filename if any */
-            if (strpos(strtolower(trim($line)), "filename=")) {
-                $pos = strpos($line, "filename=") + 9;
-                $name = trim($line);
-                if (strpos($line, " ", $pos) > 0) {
-                    $name = substr($name, $pos, strpos($line, " ", $pos));
-                } else {
-                    $name = substr($name, $pos);
+                break;
+            case 'ENVELOPE':
+                break; // to be implemented, moving imap code out of the nessages class
+                sqimap_parse_address($read,$i,$msg);
+                break; // to be implemented, moving imap code out of the nessages class
+            case 'BODYSTRUCTURE':
+                break;
+            case 'INTERNALDATE':
+                $msg['INTERNALDATE'] = str_replace('  ', ' ',parseString($read,$i));
+                break;
+            case 'BODY.PEEK[HEADER.FIELDS':
+            case 'BODY[HEADER.FIELDS':
+                $i = strpos($read,'{',$i);
+                $header = parseString($read,$i);
+                if ($header === false) break 2;
+                /* First we replace all \r\n by \n, and unfold the header */
+                $hdr = trim(str_replace(array("\r\n", "\n\t", "\n "),array("\n", ' ', ' '), $header));
+                /* Now we can make a new header array with */
+                /* each element representing a headerline  */
+                $hdr = explode("\n" , $hdr);
+                $aReceived = array();
+                foreach ($hdr as $line) {
+                    $pos = strpos($line, ':');
+                    if ($pos > 0) {
+                        $field = strtolower(substr($line, 0, $pos));
+                        if (!strstr($field,' ')) { /* valid field */
+                            $value = trim(substr($line, $pos+1));
+                            switch($field)
+                            {
+                            case 'to': $msg['TO'] = $value; break;
+                            case 'cc': $msg['CC'] = $value; break;
+                            case 'from': $msg['FROM'] = $value; break;
+                            case 'date':
+                                $msg['DATE'] = str_replace('  ', ' ', $value);
+                                break;
+                            case 'x-priority': $msg['PRIORITY'] = $value; break;
+                            case 'subject': $msg['SUBJECT'] = $value; break;
+                            case 'content-type':
+                                $type = $value;
+                                if ($pos = strpos($type, ";")) {
+                                    $type = substr($type, 0, $pos);
+                                }
+                                $type = explode("/", $type);
+                                if(!is_array($type)) {
+                                    $msg['TYPE0'] = 'text';
+                                    $msg['TYPE1'] = 'plain';
+                                }
+                                break;
+                            case 'received':
+                                $aReceived[] = $value;
+                                break;
+                            default: break;
+                            }
+                        }
+                    }
                 }
-                $name = str_replace("\"", "", $name);
-                $hdr->filename = $name;
-            }
-        }
-        /* REPLY-TO */
-        else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
-            $hdr->replyto = trim(substr($read[$i], 9, strlen($read[$i])));
-            $i++;
-        }
-        /* FROM */
-        else if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
-            if (! isset($hdr->replyto) || $hdr->replyto == "") {
-                $hdr->replyto = $hdr->from;
-            }
-            $i++;
-        }
-        /* DATE */
-        else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
-            $d = substr($read[$i], 5);
-            $d = trim($d);
-            $d = strtr($d, array('  ' => ' '));
-            $d = explode(' ', $d);
-            $hdr->date = getTimeStamp($d);
-            $i++;
-        }
-        /* SUBJECT */
-        else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $hdr->subject = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
-            if (strlen(Chop($hdr->subject)) == 0) {
-               $hdr->subject = _("(no subject)");
-            }
-            /*
-            if ($where == 'SUBJECT') {
-                 $hdr->subject = $what;
-                 // $hdr->subject = eregi_replace($what, "<b>\\0</b>", $hdr->subject);
-            }
-            */
-            $i++;
-        }
-        /* CC */
-        else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
-            $pos = 0;
-	    if (isset($read_fold[0])) {
-        	$hdr->cc[$pos] = trim(substr($read_fold[0], 4));
-		$pos++;
-        	while ($pos < count($read_fold)) {		    
-            	    $hdr->cc[$pos] = trim($read_fold[$pos]);
-            	    $pos++;
-		}
-            } else {
-        	$hdr->cc[$pos] = trim(substr($read[$i], 4));
-            }
-	    $i++;
-        }
-        /* BCC */
-        else if (strtolower(substr($read[$i], 0, 4)) == "bcc:") {
-            $pos = 0;
-	    if (isset($read_fold[0])) {
-        	$hdr->bcc[$pos] = trim(substr($read_fold[0], 5));
-		$pos++;
-        	while ($pos < count($read_fold)) {		    
-            	    $hdr->bcc[$pos] = trim($read_fold[$pos]);
-            	    $pos++;
-		}
-            } else {
-        	$hdr->bcc[$pos] = trim(substr($read[$i], 5));
-            }
-	    $i++;
-        }
-        /* TO */
-        else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
-            $pos = 0;
-	    if (isset($read_fold[0])) {
-        	$hdr->to[$pos] = trim(substr($read_fold[0], 4));
-		$pos++;
-        	while ($pos < count($read_fold)) {		    
-            	    $hdr->to[$pos] = trim($read_fold[$pos]);
-            	    $pos++;
-		}
-            } else {
-        	$hdr->to[$pos] = trim(substr($read[$i], 4));
-            }
-	    $i++;
-	    
-        }
-        /* MESSAGE ID */
-        else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
-            $hdr->message_id = trim(substr($read[$i], 11));
-            $i++;
-        }
-        /* ERROR CORRECTION */
-        else if (substr($read[$i], 0, 1) == ")") {
-            if (strlen(trim($hdr->subject)) == 0) {
-                $hdr->subject = _("(no subject)");
-            }
-            if (strlen(trim($hdr->from)) == 0) {
-                $hdr->from = _("(unknown sender)");
-            }
-            if (strlen(trim($hdr->date)) == 0) {
-                $hdr->date = time();
+                if (count($aReceived)) {
+                    $msg['RECEIVED'] = $aReceived;
+                }
+                break;
+            default:
+                ++$i;
+                break;
             }
-            $i++;
         }
-        /* X-PRIORITY */
-        else if (strtolower(substr($read[$i], 0, 11)) == "x-priority:") {
-            $hdr->priority = trim(substr($read[$i], 11));
-            $i++;
+        $msgi ="$unique_id";
+        $msg['ID'] = $unique_id;
+
+        $messages[$msgi] = $msg;
+        ++$msgi;
+    }
+    array_reverse($messages);
+    return $messages;
+}
+
+function sqimap_parse_envelope($read, &$i, &$msg) {
+    $arg_no = 0;
+    $arg_a = array();
+    ++$i;
+    for ($cnt = strlen($read); ($i < $cnt) && ($read{$i} != ')'); ++$i) {
+        $char = strtoupper($read{$i});
+        switch ($char) {
+            case '{':
+            case '"':
+                $arg_a[] = parseString($read,$i);
+                ++$arg_no;
+                break;
+            case 'N':
+                /* probably NIL argument */
+                if (strtoupper(substr($read, $i, 3)) == 'NIL') {
+                    $arg_a[] = '';
+                    ++$arg_no;
+                    $i += 2;
+                }
+                break;
+            case '(':
+                /* Address structure (with group support)
+                * Note: Group support is useless on SMTP connections
+                *       because the protocol doesn't support it
+                */
+                $addr_a = array();
+                $group = '';
+                $a=0;
+                for (; $i < $cnt && $read{$i} != ')'; ++$i) {
+                    if ($read{$i} == '(') {
+                        $addr = sqimap_parse_address($read, $i);
+                        if (($addr[3] == '') && ($addr[2] != '')) {
+                            /* start of group */
+                            $group = $addr[2];
+                            $group_addr = $addr;
+                            $j = $a;
+                        } else if ($group && ($addr[3] == '') && ($addr[2] == '')) {
+                        /* end group */
+                            if ($a == ($j+1)) { /* no group members */
+                                $group_addr[4] = $group;
+                                $group_addr[2] = '';
+                                $group_addr[0] = "$group: Undisclosed recipients;";
+                                $addr_a[] = $group_addr;
+                                $group ='';
+                            }
+                        } else {
+                            $addr[4] = $group;
+                            $addr_a[] = $addr;
+                        }
+                        ++$a;
+                    }
+                }
+                $arg_a[] = $addr_a;
+                break;
+            default: break;
         }
-        else {
-            $i++;
+    }
+
+    if (count($arg_a) > 9) {
+        $d = strtr($arg_a[0], array('  ' => ' '));
+        $d = explode(' ', $d);
+        if (!$arg_a[1]) $arg_1[1] = '';
+        $msg['DATE'] = $d; /* argument 1: date */
+        $msg['SUBJECT'] = $arg_a[1];     /* argument 2: subject */
+        $msg['FROM'] = is_array($arg_a[2]) ? $arg_a[2][0] : '';     /* argument 3: from        */
+        $msg['SENDER'] = is_array($arg_a[3]) ? $arg_a[3][0] : '';   /* argument 4: sender      */
+        $msg['REPLY-TO'] = is_array($arg_a[4]) ? $arg_a[4][0] : '';  /* argument 5: reply-to    */
+        $msg['TO'] = $arg_a[5];          /* argument 6: to          */
+        $msg['CC'] = $arg_a[6];          /* argument 7: cc          */
+        $msg['BCC'] = $arg_a[7];         /* argument 8: bcc         */
+        $msg['IN-REPLY-TO'] = $arg_a[8];   /* argument 9: in-reply-to */
+        $msg['MESSAGE-ID'] = $arg_a[9];  /* argument 10: message-id */
+    }
+}
+
+function sqimap_parse_address($read, &$i) {
+    $arg_a = array();
+    for (; $read{$i} != ')'; ++$i) {
+        $char = strtoupper($read{$i});
+        switch ($char) {
+            case '{':
+            case '"': $arg_a[] =  parseString($read,$i); break;
+            case 'n':
+            case 'N':
+                if (strtoupper(substr($read, $i, 3)) == 'NIL') {
+                    $arg_a[] = '';
+                    $i += 2;
+                }
+                break;
+            default: break;
         }
-	$read_fold=array();
-     }
-     return $hdr;
+    }
+
+    if (count($arg_a) == 4) {
+        return $arg_a;
+
+//        $adr = new AddressStructure();
+//        $adr->personal = $arg_a[0];
+//        $adr->adl = $arg_a[1];
+//        $adr->mailbox = $arg_a[2];
+//        $adr->host = $arg_a[3];
+    } else {
+        $adr = '';
+    }
+    return $adr;
 }
 
-/* Returns the body of a message. */
-function sqimap_get_message_body ($imap_stream, &$header) {
-    $id = $header->id;
-    return decodeMime($imap_stream, $header);
+/**
+* Returns a message array with all the information about a message.
+* See the documentation folder for more information about this array.
+*/
+function sqimap_get_message ($imap_stream, $id, $mailbox) {
+    // typecast to int to prohibit 1:* msgs sets
+    $id = (int) $id;
+    $flags = array();
+    $read = sqimap_run_command ($imap_stream, "FETCH $id (FLAGS BODYSTRUCTURE)", true, $response, $message, TRUE);
+    if ($read) {
+        if (preg_match('/.+FLAGS\s\((.*)\)\s/AUi',$read[0],$regs)) {
+            if (trim($regs[1])) {
+                $flags = preg_split('/ /', $regs[1],-1,'PREG_SPLIT_NI_EMPTY');
+            }
+        }
+    } else {
+        /* the message was not found, maybe the mailbox was modified? */
+        global $sort, $startMessage, $color;
+
+        $errmessage = _("The server couldn't find the message you requested.") .
+            '<p>'._("Most probably your message list was out of date and the message has been moved away or deleted (perhaps by another program accessing the same mailbox).");
+        /* this will include a link back to the message list */
+        error_message($errmessage, $mailbox, $sort, (int) $startMessage, $color);
+        exit;
+    }
+    $bodystructure = implode('',$read);
+    $msg =  mime_structure($bodystructure,$flags);
+    $read = sqimap_run_command ($imap_stream, "FETCH $id BODY[HEADER]", true, $response, $message, TRUE);
+    $rfc822_header = new Rfc822Header();
+    $rfc822_header->parseHeader($read);
+    $msg->rfc822_header = $rfc822_header;
+    return $msg;
 }
 
 ?>