X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=2ca805e637d87dc69f3da62eb434da9dbdf85b85;hp=345221425e4823226b728df32e8ea32de9df7e68;hb=fb745cc7d13d3cf5142d9c36dbd7539041599508;hpb=43786d5ceabf332c814c8d02eaf12a3f7aca6d79

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 34522142..2ca805e6 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -11,46 +11,32 @@
  * $Id$
  */
 
-/****************************************************************************
- **  Copies specified messages to specified folder
- ****************************************************************************/
+/* Copies specified messages to specified folder */
 function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
     $read = sqimap_run_command ($imap_stream, "COPY $start:$end \"$mailbox\"", true, $response, $message);
 }
 
-/****************************************************************************
- **  Deletes specified messages and moves them to trash if possible
- ****************************************************************************/
+/* Deletes specified messages and moves them to trash if possible */
 function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
     global $move_to_trash, $trash_folder, $auto_expunge;
 
     if (($move_to_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");
-    } else {
-        sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
     }
+    sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
 }
 
-/****************************************************************************
- **  Sets the specified messages with specified flag
- ****************************************************************************/
+/* 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);
 }
 
-
-/****************************************************************************
- **  Remove specified flag from specified messages
- ****************************************************************************/
+/* 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);
 }
 
-
-/****************************************************************************
- **  Returns some general header information -- FROM, DATE, and SUBJECT
- ****************************************************************************/
+/* Returns some general header information -- FROM, DATE, and SUBJECT */
 class small_header {
     var $from = '', $subject = '', $date = '', $to = '', 
         $priority = 0, $message_id = 0, $cc = '';
@@ -60,8 +46,9 @@ function sqimap_get_small_header ($imap_stream, $id, $sent) {
     $res = sqimap_get_small_header_list($imap_stream, array($id), $sent);
     return $res[0];
 }
-   
-/* Sort the message list and crunch to be as small as 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) {
@@ -84,12 +71,227 @@ 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.PEEK[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;
+}
+
+
+/* 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');
+    }
+    $sid = sqimap_session_id();
+    $sort_on = array();
+    $reverse = 0;
+    $server_sort_array = array();
+    $sort_test = array();
+    $sort_query = '';
+    $sort_on = array (0=> 'DATE',
+                      1=> 'DATE',
+                      2=> 'FROM',
+                      3=> 'FROM',
+                      4=> 'SUBJECT',
+                      5=> 'SUBJECT',
+                      6=> 'DATE');
+    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 (preg_match("/^\* SORT (.+)$/", $sort_test[0], $regs)) {
+        $server_sort_array = preg_split("/ /", trim($regs[1]));
+    }
+    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;
+}
+	
+/* 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 = "";
+    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();
+        }
+    for ($i=0;$i<count($thread_new);$i++) {
+        if (isset($thread_new[$i][0])) {
+        if (preg_match("/(\d+)/", $thread_new[$i][0], $regs)) {
+            $parent = $regs[1];
+        }
+        }
+        $indent_array[$parent] = 0;
+        $indent = 0;
+        $go = 'stop';
+        $spaces = array ();
+        $l = 0;
+        for ($k=1;$k<(count($thread_new[$i]))-1;$k++) {
+            $chars = count_chars($thread_new[$i][$k], 1);
+            if (isset($chars['40']) && isset($chars['41'])) {
+                $l--;
+            }
+            if (isset($chars['40'])) {  // (
+                $indent = $indent + $chars[40];
+                $go = 'start';
+                $l++;
+            }
+            if (isset($chars['41'])) {  //  )
+                if ($go == 'start') {
+                    if (!isset($spaces[$l])) {
+                                                $spaces[$l] = 0;
+                                        }
+                    $indent = $indent - $spaces[$l];
+                    $indent = $indent - $chars[41] ;
+                    $go = 'stop';
+                    $l--;
+                }
+                else {
+                    $indent = $indent - $chars[41];
+                }
+            }
+            if (isset($chars['32'])) {  //  space
+                $indent = $indent + $chars[32];
+                if ($go == 'start') {
+                    if (!isset($spaces[$l])) {
+                                                $spaces[$l] = 0;
+                                        }
+                    $spaces[$l] = $spaces[$l] + $chars[32];
+                }
+            }
+            if (preg_match("/(\d+)/", $thread_new[$i][$k], $regs)) {
+                $child = $regs[1];
+            }
+            $indent_array[$child] = abs($indent);
+        }    
+    }
+    return $indent_array;
+}
+
+
+/* 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');
+    }
+    if (session_is_registered('server_sort_array')) {
+        session_unregister('server_srot_array');
+    }
+    $sid = sqimap_session_id();
+    $thread_temp = array ();
+    if ($sort_by_ref == 1) {
+        $sort_type = 'REFERENCES';
+    }
+    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);
+    if (preg_match("/^\* THREAD (.+)$/", $thread_test[0], $regs)) {
+       $thread_list = trim($regs[1]);
+    }
+    else {
+       $thread_list = "";
+    }
+    if (!preg_match("/OK/", $response)) {
+	   $server_sort_array = 'no';
+	   return $server_sort_array;
+	}
+    $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;
+                    }
+            }
+    }
+        session_register('$thread_new');
+    $thread_new = array_reverse($thread_new);
+    $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');
+    return $thread_list;
+}
+
+
 
 function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
-    global $squirrelmail_language, $color;
+    global $squirrelmail_language, $color, $data_dir, $username;
 
     /* Get the small headers for each message in $msg_list */
     $sid = sqimap_session_id();
@@ -98,8 +300,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
     $results = array();
     $read_list = array();
     $sizes_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
@@ -108,7 +309,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
         $id2index[$msg_list[$i]] = $i;
     }
 
-    $query = "$sid FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";
+    $query = "$sid FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type In-Reply-To)]\r\n";
     fputs ($imap_stream, $query);
     $readin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
 
@@ -120,7 +321,6 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
                   '</b><br>' .
                   _("Unknown response from IMAP server: ") . ' 1.' .
                   $r[0] . "</font><br>\n";
-             /* exit; */
         } else if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
              set_up_language($squirrelmail_language);
              echo '<br><b><font color=$color[2]>' .
@@ -128,17 +328,16 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
                   '</b><br>' .
                   _("Unknown message number in reply from server: ") .
                   $regs[1] . "</font><br>\n";
-             /* exit */
         } else {
              $read_list[$id2index[$regs[1]]] = $r;
         }
     }
     arsort($read_list);
-      
+
     $query = "$sid FETCH $msgs_str RFC822.SIZE\r\n";
     fputs ($imap_stream, $query);
     $sizesin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
-      
+
     foreach ($sizesin_list as $r) {
         if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
             set_up_language($squirrelmail_language);
@@ -161,7 +360,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
         $sizes_list[$id2index[$regs[1]]] = $r;
     }
     arsort($sizes_list);
-      
+
     for ($msgi = 0; $msgi < $maxmsg; $msgi++) {
         $subject = _("(no subject)");
         $from = _("Unknown Sender");
@@ -172,53 +371,61 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
         $date = "";
         $type[0] = "";
         $type[1] = "";
+        $inrepto = "";
         $read = $read_list[$msgi];
 
-        for ($i = 0; $i < count($read); $i++) {
-            if (eregi ("^to:(.*)$", $read[$i], $regs)) {
-                /*$to = sqimap_find_displayable_name(substr($read[$i], 3));*/
+        $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);
+            }
+            $prevline = $read_part;
+            if (eregi ("^to:(.*)$", $read_part, $regs)) {
                 $to = $regs[1];
-            } else if (eregi ("^from:(.*)$", $read[$i], $regs)) {
-                /*$from = sqimap_find_displayable_name(substr($read[$i], 5));*/
+            } else if (eregi ("^from:(.*)$", $read_part, $regs)) {
                 $from = $regs[1];
-            } else if (eregi ("^x-priority:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^x-priority:(.*)$", $read_part, $regs)) {
                 $priority = trim($regs[1]);
-            } else if (eregi ("^message-id:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^message-id:(.*)$", $read_part, $regs)) {
                 $messageid = trim($regs[1]);
-            } else if (eregi ("^cc:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^cc:(.*)$", $read_part, $regs)) {
                 $cc = $regs[1];
-            } else if (eregi ("^date:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^date:(.*)$", $read_part, $regs)) {
                 $date = $regs[1];
-            } else if (eregi ("^subject:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^subject:(.*)$", $read_part, $regs)) {
                 $subject = htmlspecialchars(trim($regs[1]));
                 if ($subject == "") {
                     $subject = _("(no subject)");
                 }
-            } else if (eregi ("^content-type:(.*)$", $read[$i], $regs)) {
+            } else if (eregi ("^content-type:(.*)$", $read_part, $regs)) {
                 $type = strtolower(trim($regs[1]));
                 if ($pos = strpos($type, ";")) {
                     $type = substr($type, 0, $pos);
                 }
                 $type = explode("/", $type);
-                if (! isset($type[1])) {
+                if (!isset($type[1])) {
                     $type[1] = '';
                 }
+            } else if (eregi ("^in-reply-to:(.*)$", $read_part, $regs)) {
+                $inrepto = trim($regs[1]);
             }
         }
-        if (trim($date) == "") {
+        $internaldate = getPref($data_dir, $username, 'internal_date_sort');
+        if (trim($date) == "" || $internaldate) {
             fputs($imap_stream, "$sid FETCH $msg_list[$msgi] INTERNALDATE\r\n");
             $readdate = sqimap_read_data($imap_stream, $sid, true, $response, $message);
             if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) {
-                $date_list = explode(" ", trim($regs[1]));
-                $date_list[0] = str_replace("-", " ", $date_list[0]);
-                $date = implode(" ", $date_list);
+                $date_list = explode(' ', trim($regs[1]));
+                $date_list[0] = str_replace("-", ' ', $date_list[0]);
+                $date = implode(' ', $date_list);
             }
         }
         eregi("([0-9]+)[^0-9]*$", $sizes_list[$msgi][0], $regs);
         $size = $regs[1];
-         
+
         $header = new small_header;
-        if ($issent == true) {
+        if ($issent) {
             $header->from = (trim($to) != '' ? $to : '(' ._("No To Address") . ')');
         } else {
             $header->from = $from;
@@ -233,21 +440,19 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
         $header->size = $size;
         $header->type0 = $type[0];
         $header->type1 = $type[1];
-
+		$header->inrepto = $inrepto;
         $result[] = $header;
     }
     return $result;
 }
 
-/****************************************************************************
- **  Returns the flags for the specified messages 
- ****************************************************************************/
+/* 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)) {
+    if (ereg('FLAGS(.*)', $read[0], $regs)) {
         return explode(' ', trim(ereg_replace('[\\(\\)\\\\]', '', $regs[1])));
     }
-    return Array('None');
+    return array('None');
 }
 
 function sqimap_get_flags_list ($imap_stream, $msg_list) {
@@ -259,7 +464,7 @@ function sqimap_get_flags_list ($imap_stream, $msg_list) {
     $result_flags = array();
 
     for ($i = 0; $i < sizeof($result_list); $i++) {
-        if (eregi("^\\* ([0-9]+).*FETCH.*FLAGS(.*)", $result_list[$i][0], $regs)
+        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 {
@@ -276,31 +481,25 @@ function sqimap_get_flags_list ($imap_stream, $msg_list) {
     return $result_flags;
 }
 
-/****************************************************************************
- **  Returns a message array with all the information about a message.  See
- **  the documentation folder for more information about this array.
- ****************************************************************************/
+/*
+ * 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.
- ****************************************************************************/
+/* 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.
- ****************************************************************************/
+/* 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); 
@@ -310,9 +509,7 @@ function sqimap_get_ent_header ($imap_stream, $id, $mailbox, $ent) {
 }
 
 
-/****************************************************************************
- **  Wrapper function that returns entity headers for use by decodeMime
- ****************************************************************************/
+/* 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);
@@ -324,40 +521,41 @@ function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bou
     $filename = $header["FILENAME"];
 }
 */
-
-/****************************************************************************
- **  Queries the IMAP server and gets all header information.
- ****************************************************************************/
+/* Queries the IMAP server and gets all header information. */
 function sqimap_get_header ($imap_stream, $read) {
     global $where, $what;
 
     $hdr = new msg_header();
     $i = 0;
+
     /* Set up some defaults */
     $hdr->type0 = "text";
     $hdr->type1 = "plain";
     $hdr->charset = "us-ascii";
 
     while ($i < count($read)) {
+        //unfold multi-line headers
+        while ($i + 1 < count($read) && strspn($read[$i + 1], "\t ") > 0) {
+            $read[$i + 1] = substr($read[$i], 0, -2) . ' ' . ltrim($read[$i + 1]);
+            array_splice($read, $i, 1);
+        }
+
         if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $hdr->mime = true;
             $i++;
         }
-
-        /** ENCODING TYPE **/
+        /* 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:") {
+        /* 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);
@@ -365,7 +563,6 @@ function sqimap_get_header ($imap_stream, $read) {
                 $hdr->type0 = $cont;
             }
 
-
             $line = $read[$i];
             $i++;
             while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
@@ -375,12 +572,12 @@ function sqimap_get_header ($imap_stream, $read) {
                 $i++;
             }
 
-            /** Detect the boundary of a multipart message **/
+            /* Detect the boundary of a multipart message */
             if (eregi('boundary="([^"]+)"', $line, $regs)) {
                 $hdr->boundary = $regs[1];
             }
 
-            /** Detect the charset **/
+            /* Detect the charset */
             if (strpos(strtolower(trim($line)), "charset=")) {
                 $pos = strpos($line, "charset=") + 8;
                 $charset = trim($line);
@@ -395,10 +592,8 @@ function sqimap_get_header ($imap_stream, $read) {
                 $hdr->charset = "us-ascii";
             }
         }
-
         else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {
-            /** Add better dontent-disposition support **/
-            
+            /* 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]) != ")")) {
@@ -408,27 +603,25 @@ function sqimap_get_header ($imap_stream, $read) {
                 $i++;
             }
 
-            /** Detects filename if any **/
+            /* 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));
+                    $name = substr($name, $pos, strpos($line, " ", $pos));
                 } else {
-                   $name = substr($name, $pos);
+                    $name = substr($name, $pos);
                 }
                 $name = str_replace("\"", "", $name);
                 $hdr->filename = $name;
             }
         }
-
-        /** REPLY-TO **/
+        /* REPLY-TO */
         else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
             $hdr->replyto = trim(substr($read[$i], 9, strlen($read[$i])));
             $i++;
         }
-
-        /** FROM **/
+        /* 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 == "") {
@@ -436,7 +629,7 @@ function sqimap_get_header ($imap_stream, $read) {
             }
             $i++;
         }
-        /** DATE **/
+        /* DATE */
         else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
             $d = substr($read[$i], 5);
             $d = trim($d);
@@ -445,23 +638,21 @@ function sqimap_get_header ($imap_stream, $read) {
             $hdr->date = getTimeStamp($d);
             $i++;
         }
-        /** SUBJECT **/
+        /* 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 **/
+        /* CC */
         else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
             $pos = 0;
             $hdr->cc[$pos] = trim(substr($read[$i], 4));
@@ -472,7 +663,7 @@ function sqimap_get_header ($imap_stream, $read) {
                 $i++;
             }
         }
-        /** BCC **/
+        /* BCC */
         else if (strtolower(substr($read[$i], 0, 4)) == "bcc:") {
             $pos = 0;
             $hdr->bcc[$pos] = trim(substr($read[$i], 5));
@@ -483,7 +674,7 @@ function sqimap_get_header ($imap_stream, $read) {
                 $i++;
             }
         }
-        /** TO **/
+        /* TO */
         else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
             $pos = 0;
             $hdr->to[$pos] = trim(substr($read[$i], 4));
@@ -494,14 +685,12 @@ function sqimap_get_header ($imap_stream, $read) {
                 $i++;
             }
         }
-        /** MESSAGE ID **/
+        /* MESSAGE ID */
         else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
             $hdr->message_id = trim(substr($read[$i], 11));
             $i++;
         }
-
-
-        /** ERROR CORRECTION **/
+        /* ERROR CORRECTION */
         else if (substr($read[$i], 0, 1) == ")") {
             if (strlen(trim($hdr->subject)) == 0) {
                 $hdr->subject = _("(no subject)");
@@ -514,7 +703,7 @@ function sqimap_get_header ($imap_stream, $read) {
             }
             $i++;
         }
-        /** X-PRIORITY **/
+        /* X-PRIORITY */
         else if (strtolower(substr($read[$i], 0, 11)) == "x-priority:") {
             $hdr->priority = trim(substr($read[$i], 11));
             $i++;
@@ -526,17 +715,10 @@ function sqimap_get_header ($imap_stream, $read) {
      return $hdr;
 }
 
-
-/****************************************************************************
- **  Returns the body of a message.
- ****************************************************************************/
+/* Returns the body of a message. */
 function sqimap_get_message_body ($imap_stream, &$header) {
     $id = $header->id;
     return decodeMime($imap_stream, $header);
 }
 
-
-/****************************************************************************
- **  Returns an array with the body structure 
- ****************************************************************************/
 ?>