Changeset 1478 in subversion for trunk/roundcubemail/program/lib/imap.inc

Timestamp:

Jun 5, 2008 1:26:52 PM (5 years ago)

Author:

alec

Message:

• added iil_PutLine() wrapper for fputs()
• code cleanup and identation fixes

File:

• trunk/roundcubemail/program/lib/imap.inc (modified) (116 diffs)

trunk/roundcubemail/program/lib/imap.inc

@@ -61 +61 @@
                 - fixed iil_C_FetchStructureString() to handle many literal strings in response
                 - removed hardcoded data size in iil_ReadLine() 
+                - added iil_PutLine() wrapper for fputs()
+                - code cleanup and identation fixes
 
 ********************************************************/
@@ -160 +162 @@
 }
 
-
 function iil_xor($string, $string2) {
-    $result = '';
-    $size = strlen($string);
-    for ($i=0; $i<$size; $i++) {
-        $result .= chr(ord($string[$i]) ^ ord($string2[$i]));
-    }
-    return $result;
+        $result = '';
+        $size = strlen($string);
+        for ($i=0; $i<$size; $i++) {
+                $result .= chr(ord($string[$i]) ^ ord($string2[$i]));
+        }
+        return $result;
+}
+
+function iil_PutLine($fp, $string, $endln=true) {
+//      console('C: '. $string);
+        return fputs($fp, $string . ($endln ? "\r\n" : ''));
 }
 
 function iil_ReadLine($fp, $size) {
-    $line = '';
-    if (!$fp) {
-        return $line;
-    }
-    
-    if (!$size) {
-        $size = 1024;
-    }
-    
-    do {
-        $buffer = fgets($fp, $size);
-        if ($buffer === false) {
-            break;
-        }
-        $line .= $buffer;
-    } while ($buffer[strlen($buffer)-1] != "\n");
-    return $line;
+        $line = '';
+
+        if (!$fp) {
+                return $line;
+        }
+    
+        if (!$size) {
+                $size = 1024;
+        }
+    
+        do {
+                $buffer = fgets($fp, $size);
+                if ($buffer === false) {
+                        break;
+                }
+//              console('S: '. chop($buffer));
+                $line .= $buffer;
+        } while ($buffer[strlen($buffer)-1] != "\n");
+        
+        return $line;
 }
 
@@ -198 +207 @@
                 $bytes = $a[2][0];
                 while (strlen($out) < $bytes) {
-                    $line = iil_ReadBytes($fp, $bytes); 
-                    $out .= $line;
+                        $line = iil_ReadBytes($fp, $bytes); 
+                        $out .= $line;
                 }
                 $line = $a[1][0] . "\"$out\"";
+//              console('[...] '. $out);
         }
         return $line;
@@ -207 +217 @@
 
 function iil_ReadBytes($fp, $bytes) {
-    $data = '';
-    $len  = 0;
-    do {
-        $data .= fread($fp, $bytes-$len);
-        if ($len == strlen($data)) {
-            break; //nothing was read -> exit to avoid apache lockups
-        }
-        $len = strlen($data);
-    } while ($len < $bytes);
-    return $data;
+        $data = '';
+        $len  = 0;
+        do {
+                $data .= fread($fp, $bytes-$len);
+                if ($len == strlen($data)) {
+                        break; //nothing was read -> exit to avoid apache lockups
+                }
+                $len = strlen($data);
+        } while ($len < $bytes);
+        
+        return $data;
 }
 
@@ -231 +242 @@
         if (count($a) > 2) {
                 if (strcasecmp($a[1], 'OK') == 0) {
-                    return 0;
+                        return 0;
                 } else if (strcasecmp($a[1], 'NO') == 0) {
-                    return -1;
+                        return -1;
                 } else if (strcasecmp($a[1], 'BAD') == 0) {
-                    return -2;
-        }
-        }
-    return -3;
+                        return -2;
+                }
+        }
+        return -3;
 }
 
@@ -245 +256 @@
         $len = strlen($match);
         if ($len == 0) {
-            return false;
-    }
+                return false;
+        }
         if (strncmp($string, $match, $len) == 0) {
-            return true;
-    }
+                return true;
+        }
         return false;
 }
@@ -256 +267 @@
         $len = strlen($match);
         if ($len == 0) {
-            return false;
-    }
+                return false;
+        }
         if (strncasecmp($string, $match, $len) == 0) {
-            return true;
-    }
+                return true;
+        }
         return false;
 }
-
 
 function iil_Escape($string)
 {
-    return strtr($string, array('"'=>'\\"', '\\' => '\\\\')); 
+        return strtr($string, array('"'=>'\\"', '\\' => '\\\\')); 
 }
 
@@ -280 +290 @@
         $opad .= chr(0x5C);
     }
+
     // pad $pass so it's 64 bytes
     $padLen = 64 - strlen($pass);
@@ -295 +306 @@
     
     // send result, get reply
-    fputs($conn->fp, $reply . "\r\n");
+    iil_PutLine($conn->fp, $reply);
     $line = iil_ReadLine($conn->fp, 1024);
     
@@ -312 +323 @@
 function iil_C_Login(&$conn, $user, $password) {
 
-    fputs($conn->fp, 'a001 LOGIN "'.iil_Escape($user).'" "'.iil_Escape($password)."\"\r\n");
+    iil_PutLine($conn->fp, 'a001 LOGIN "'.iil_Escape($user).'" "'.iil_Escape($password).'"');
 
     do {
@@ -340 +351 @@
         if (!$l) {
             $str = str_replace('NIL', '()', $str);
-    }
+        }
         if (!$len) {
             $len = strlen($str);
-    }
+        }
         $data      = array();
         $in_quotes = false;
@@ -354 +365 @@
                         $elem++;
                 } else if ($c == ')' && !$in_quotes) {
-                    return $data;
-        } else if ($c == '\\') {
+                        return $data;
+                } else if ($c == '\\') {
                         $i++;
                         if ($in_quotes) {
-                            $data[$elem] .= $c.$str[$i];
-            }
+                                $data[$elem] .= $c.$str[$i];
+                        }
                 } else if ($c == '"') {
                         $in_quotes = !$in_quotes;
                         if (!$in_quotes) {
-                            $elem++;
-            }
+                                $elem++;
+                        }
                 } else if ($in_quotes) {
                         $data[$elem].=$c;
@@ -383 +394 @@
         }
     
-        fputs($conn->fp, "ns1 NAMESPACE\r\n");
+        iil_PutLine($conn->fp, "ns1 NAMESPACE");
         do {
                 $line = iil_ReadLine($conn->fp, 1024);
@@ -411 +422 @@
         
         return true;
-
 }
 
 function iil_Connect($host, $user, $password) { 
-    global $iil_error, $iil_errornum;
+        global $iil_error, $iil_errornum;
         global $ICL_SSL, $ICL_PORT;
         global $IMAP_NO_CACHE;
@@ -432 +442 @@
                 $auth_array = func_get_arg(3);
                 if (is_array($auth_array)) {
-                    $auth_method = $auth_array['imap'];
-        }
+                        $auth_method = $auth_array['imap'];
+                }
                 if (empty($auth_method)) {
-            $auth_method = "plain";
-        }
+                        $auth_method = "plain";
+                }
         }
         $message = "INITIAL: $auth_method\n";
@@ -454 +464 @@
         
         if ($my_prefs['sort_field'] == 'INTERNALDATE') {
-            $IMAP_USE_INTERNAL_DATE = true;
-    } else if ($my_prefs['sort_field'] == 'DATE') {
-        $IMAP_USE_INTERNAL_DATE = false;
-    }
+                $IMAP_USE_INTERNAL_DATE = true;
+        } else if ($my_prefs['sort_field'] == 'DATE') {
+                $IMAP_USE_INTERNAL_DATE = false;
+        }
         //echo '<!-- conn sort_field: '.$my_prefs['sort_field'].' //-->';
         
         //check input
         if (empty($host)) {
-            $iil_error .= "Invalid host\n";
-    }
+                $iil_error .= "Invalid host\n";
+        }
         if (empty($user)) {
-            $iil_error .= "Invalid user\n";
-    }
+                $iil_error .= "Invalid user\n";
+        }
         if (empty($password)) {
-            $iil_error .= "Invalid password\n";
-    }
+                $iil_error .= "Invalid password\n";
+        }
         if (!empty($iil_error)) {
-            return false;
-    }
+                return false;
+        }
         if (!$ICL_PORT) {
-            $ICL_PORT = 143;
+                $ICL_PORT = 143;
         }
     
@@ -485 +495 @@
         $conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
         if (!$conn->fp) {
-        $iil_error    = "Could not connect to $host at port $ICL_PORT: $errstr";
-        $iil_errornum = -1;
+                $iil_error = "Could not connect to $host at port $ICL_PORT: $errstr";
+                $iil_errornum = -1;
                 return false;
         }
@@ -498 +508 @@
 //              $conn->capability = explode(' ', $matches[1]);
 //      } else {
-                fputs($conn->fp, "cp01 CAPABILITY\r\n");
+                iil_PutLine($conn->fp, "cp01 CAPABILITY");
                 do {
-                        $line = trim(iil_ReadLine($conn->fp, 100));
+                        $line = trim(iil_ReadLine($conn->fp, 1024));
 
                         $conn->message .= "$line\n";
@@ -533 +543 @@
 
                 //do CRAM-MD5 authentication
-                fputs($conn->fp, "a000 AUTHENTICATE CRAM-MD5\r\n");
+                iil_PutLine($conn->fp, "a000 AUTHENTICATE CRAM-MD5");
                 $line = trim(iil_ReadLine($conn->fp, 1024));
         
@@ -547 +557 @@
                 } else {
                         $conn->message .='No challenge ('.htmlspecialchars($line)."), try plain\n";
-                        
-            $auth = 'plain';            
+                        $auth = 'plain';            
                 }
         }
@@ -572 +581 @@
 function iil_Close(&$conn) {
         iil_C_WriteCache($conn);
-        if (fputs($conn->fp, "I LOGOUT\r\n")) {
+        if (iil_PutLine($conn->fp, "I LOGOUT")) {
                 fgets($conn->fp, 1024);
                 fclose($conn->fp);
@@ -581 +590 @@
 function iil_ClearCache($user, $host) {
 }
-
 
 function iil_C_WriteCache(&$conn) {
@@ -621 +629 @@
         
         if (!$conn->do_cache) {
-            return;     //caching disabled
-        }
-    if (!is_array($conn->cache[$folder])) {
-        return; //cache not initialized|empty
-        }
-    if (count($conn->cache[$folder]) == 0) {
-        return; //cache not initialized|empty
-    }
+                return; //caching disabled
+        }
+        if (!is_array($conn->cache[$folder])) {
+                return; //cache not initialized|empty
+        }
+        if (count($conn->cache[$folder]) == 0) {
+                return; //cache not initialized|empty
+        }
     
         $uids = iil_C_FetchHeaderIndex($conn, $folder, $message_set, 'UID');
@@ -665 +673 @@
                 if (($key % 2) == 1) {
                         $quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);
-        }
-    }
+                }
+        }
         $string=implode('"', $quotes);
         
@@ -679 +687 @@
 function iil_CheckForRecent($host, $user, $password, $mailbox) {
         if (empty($mailbox)) {
-            $mailbox = 'INBOX';
+                $mailbox = 'INBOX';
         }
     
@@ -685 +693 @@
         $fp   = $conn->fp;
         if ($fp) {
-                fputs($fp, "a002 EXAMINE \"".iil_Escape($mailbox)."\"\r\n");
+                iil_PutLine($fp, "a002 EXAMINE \"".iil_Escape($mailbox)."\"");
                 do {
                         $line=chop(iil_ReadLine($fp, 300));
@@ -694 +702 @@
                 } while (!iil_StartsWith($a[0], 'a002'));
 
-                fputs($fp, "a003 LOGOUT\r\n");
+                iil_PutLine($fp, "a003 LOGOUT");
                 fclose($fp);
         } else {
@@ -704 +712 @@
 
 function iil_C_Select(&$conn, $mailbox) {
-        $fp = $conn->fp;
-        
+
         if (empty($mailbox)) {
-            return false;
-        }
-    if (strcmp($conn->selected, $mailbox) == 0) {
-        return true;
+                return false;
+        }
+        if (strcmp($conn->selected, $mailbox) == 0) {
+                return true;
         }
     
         iil_C_LoadCache($conn, $mailbox);
         
-        if (fputs($fp, "sel1 SELECT \"".iil_Escape($mailbox)."\"\r\n")) {
+        if (iil_PutLine($conn->fp, "sel1 SELECT \"".iil_Escape($mailbox).'"')) {
                 do {
-                        $line=chop(iil_ReadLine($fp, 300));
-                        $a=explode(' ', $line);
+                        $line = chop(iil_ReadLine($conn->fp, 300));
+                        $a = explode(' ', $line);
                         if (count($a) == 3) {
                                 if (strcasecmp($a[2], 'EXISTS') == 0) {
-                                    $conn->exists = (int) $a[1];
+                                        $conn->exists = (int) $a[1];
                                 }
-                if (strcasecmp($a[2], 'RECENT') == 0) {
-                    $conn->recent = (int) $a[1];
-                }
+                                if (strcasecmp($a[2], 'RECENT') == 0) {
+                                        $conn->recent = (int) $a[1];
+                                }
                         }
                 } while (!iil_StartsWith($line, 'sel1'));
 
-                $a=explode(' ', $line);
+                $a = explode(' ', $line);
 
                 if (strcasecmp($a[1], 'OK') == 0) {
@@ -736 +743 @@
                 }
         }
-    return false;
+        return false;
 }
 
 function iil_C_CheckForRecent(&$conn, $mailbox) {
         if (empty($mailbox)) {
-            $mailbox = 'INBOX';
+                $mailbox = 'INBOX';
         }
     
         iil_C_Select($conn, $mailbox);
         if ($conn->selected == $mailbox) {
-            return $conn->recent;
-        }
-    return false;
+                return $conn->recent;
+        }
+        return false;
 }
 
@@ -755 +762 @@
                 $conn->selected= '';
         }
+        
         iil_C_Select($conn, $mailbox);
         if ($conn->selected == $mailbox) {
@@ -769 +777 @@
                 return $res;
         }
-    return $string;
+        return $string;
 }
 
 function iil_StrToTime($str) {
         $IMAP_MONTHS    = $GLOBALS['IMAP_MONTHS'];
-    $IMAP_SERVER_TZ = $GLOBALS['IMAP_SERVER_TR'];
+        $IMAP_SERVER_TZ = $GLOBALS['IMAP_SERVER_TR'];
                 
         if ($str) {
-        $time1 = strtotime($str);
-    }
+            $time1 = strtotime($str);
+        }
         if ($time1 && $time1 != -1) {
             return $time1-$IMAP_SERVER_TZ;
@@ -792 +800 @@
         if (!is_numeric(substr($str, 0, $pos))) {
             $str = substr($str, $pos+1);
-    }
+        }
         //explode, take good parts
         $a = explode(' ', $str);
@@ -823 +831 @@
         if ($field == 'INTERNALDATE') {
             $field = 'ARRIVAL';
-    }
+        }
+        
         $fields = array('ARRIVAL' => 1,'CC' => 1,'DATE' => 1,
         'FROM' => 1, 'SIZE' => 1, 'SUBJECT' => 1, 'TO' => 1);
@@ -835 +844 @@
         if (!empty($add)) {
             $add = " $add";
-    }
+        }
 
         $fp       = $conn->fp;
         $command  = 's ' . $is_uid . 'SORT (' . $field . ') ';
-        $command .= $encoding . ' ALL' . "$add\r\n";
+        $command .= $encoding . ' ALL' . $add;
         $line     = $data = '';
         
-        if (!fputs($fp, $command)) {
+        if (!iil_PutLine($fp, $command)) {
             return false;
         }
@@ -848 +857 @@
                 $line = chop(iil_ReadLine($fp, 1024));
                 if (iil_StartsWith($line, '* SORT')) {
-                    $data .= ($data?' ':'') . substr($line, 7);
-        }
+                        $data .= ($data?' ':'') . substr($line, 7);
+                }
         } while ($line[0]!='s');
         
@@ -871 +880 @@
         if (empty($index_field)) {
             $index_field = 'DATE';
-    }
+        }
         $index_field = strtoupper($index_field);
         
         list($from_idx, $to_idx) = explode(':', $message_set);
         if (empty($message_set) || (isset($to_idx)
-        && (int)$from_idx > (int)$to_idx)) {
+            && (int)$from_idx > (int)$to_idx)) {
                 return false;
-    }
+        }
         
         //$fields_a['DATE'] = ($IMAP_USE_INTERNAL_DATE?6:1);
@@ -902 +911 @@
         if (!iil_C_Select($conn, $mailbox)) {
             return false;
-    }
+        }
     
         /* FETCH date,from,subject headers */
         if ($mode == 1) {
                 $key     = 'fhi' . ($c++);
-                $request = $key . " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ($index_field)])\r\n";
-                if (!fputs($fp, $request)) {
+                $request = $key . " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ($index_field)])";
+                if (!iil_PutLine($fp, $request)) {
                     return false;
-        }
+                }
                 do {
                         
@@ -916 +925 @@
                         $a=explode(' ', $line);
                         if (($line[0] == '*') && ($a[2] == 'FETCH')
-                && ($line[strlen($line)-1] != ')')) {
+                            && ($line[strlen($line)-1] != ')')) {
                                 $id=$a[1];
 
@@ -935 +944 @@
                                                                 if ($normalize) {
                                                                     $result[$id] = strtoupper($result[$id]);
-                                }
+                                                                }
                                                         }
                                                         $str=$line;
@@ -955 +964 @@
                                         
                                         if ($received>$bytes) {
-                        break;
+                                                break;
                                         } else if (!$line) {
-                        continue;
+                                                continue;
                                         }
 
@@ -966 +975 @@
                                         } else if ($index_field != 'DATE') {
                                                 $result[$id]=strtoupper(str_replace('"', '', $string));
-                    }
+                                        }
                                 } while ($line[0] != ')');
                         }Â else {
@@ -977 +986 @@
 
                 $key     = 'fhi' . ($c++);
-                $request = $key . " FETCH $message_set (INTERNALDATE)\r\n";
-                if (!fputs($fp, $request)) {
+                $request = $key . " FETCH $message_set (INTERNALDATE)";
+                if (!iil_PutLine($fp, $request)) {
                     return false;
-        }
+                }
                 do {
                         $line=chop(iil_ReadLine($fp, 200));
@@ -1011 +1020 @@
                 } else {
                     $field_name = $index_field;
-        }
+                }
         
                 /*                      FETCH uid, size, flags          */
                 $key     = 'fhi' .($c++);
-                $request = $key . " FETCH $message_set ($field_name)\r\n";
-
-                if (!fputs($fp, $request)) {
+                $request = $key . " FETCH $message_set ($field_name)";
+
+                if (!iil_PutLine($fp, $request)) {
                     return false;
-        }
+                }
                 do {
                         $line=chop(iil_ReadLine($fp, 200));
@@ -1033 +1042 @@
                                     continue; //if we already got the data, skip forward
                                 }
-                if ($a[3]!=$field_name) {
-                    continue;  //make sure it's returning what we requested
-                            }
+                                if ($a[3]!=$field_name) {
+                                        continue;  //make sure it's returning what we requested
+                                }
                 
                                 /*  Caution, bad assumptions, next several lines */
@@ -1057 +1066 @@
                 if (count($result) < $should_have) {
                         for ($i=$start_mid; $i<=$end_mid; $i++) {
-                            if (!isset($result[$i])) {
-                                $result[$i] = '';
-                }
-            }
+                                if (!isset($result[$i])) {
+                                        $result[$i] = '';
+                                }
+                        }
                 }
         }
@@ -1095 +1104 @@
                             $result[] = $start . ':' . $prev;   //push sequence as start_id:end_id
                         }
-            $start = $id;                                                       //start of new sequence
+                        $start = $id;                   //start of new sequence
                 }
                 $prev = $id;
         }
+
         //handle the last sequence/id
         if ($start==$prev) {
             $result[] = $prev;
-    } else {
-        $result[] = $start.':'.$prev;
-    }
+        } else {
+            $result[] = $start.':'.$prev;
+        }
     
         //return as comma separated string
@@ -1113 +1123 @@
         if (!is_array($uids) || count($uids) == 0) {
             return array();
-    }
+        }
         return iil_C_Search($conn, $mailbox, 'UID ' . implode(',', $uids));
 }
@@ -1122 +1132 @@
             return $result[0];
         }
-    return false;
+        return false;
 }
 
@@ -1131 +1141 @@
         if ($num == 0) {
             return array();
-    }
+        }
         $message_set = '1' . ($num>1?':' . $num:'');
         
@@ -1163 +1173 @@
                 if (!$temp || !is_array($temp) || $temp[0] != $num) {
                     $cache_good = -3;
-        }
+                }
         }
 
@@ -1198 +1208 @@
         && (int)$from_idx > (int)$to_idx)) {
                 return false;
-    }
+        }
 
         $result = array();
@@ -1215 +1225 @@
                                 } else {
                                     $needed_set .= ($needed_set ? ',' : '') . $id;
-                }
+                                }
                         }
                         if ($needed_set) {
@@ -1221 +1231 @@
                         } else {
                             $message_set = '';
-            }
+                        }
                 }
         }
@@ -1235 +1245 @@
                 $fp         = $conn->fp;
                 $request    = $key . " FETCH $message_set ";
-        $request   .= "(BODY.PEEK[HEADER.FIELDS (SUBJECT MESSAGE-ID IN-REPLY-TO)])\r\n";
+                $request   .= "(BODY.PEEK[HEADER.FIELDS (SUBJECT MESSAGE-ID IN-REPLY-TO)])";
                 $mid_to_id  = array();
-                if (!fputs($fp, $request)) {
+                if (!iil_PutLine($fp, $request)) {
                     return false;
-        }
+                }
                 do {
                         $line = chop(iil_ReadLine($fp, 1024));
                         if ($debug) {
                             echo $line . "\n";
-            }
+                        }
                         if (ereg('\{[0-9]+\}$', $line)) {
                                 $a       = explode(' ', $line);
@@ -1254 +1264 @@
                                         $line = chop(iil_ReadLine($fp, 1024), "\r\n");
                                         if (iil_StartsWithI($line, 'Message-ID:')
-                        || (iil_StartsWithI($line,'In-Reply-To:'))
-                        || (iil_StartsWithI($line,'SUBJECT:'))) {
+                                                || (iil_StartsWithI($line,'In-Reply-To:'))
+                                                || (iil_StartsWithI($line,'SUBJECT:'))) {
 
                                                 $pos        = strpos($line, ':');
@@ -1286 +1296 @@
                 if (count($result)!=count($cached)) {
                         cache_write($conn->user, $conn->host, $mailbox . '.thhd', $result);
-        }
+                }
         }
         
@@ -1300 +1310 @@
         list($from_idx, $to_idx) = explode(':', $message_set);
         if (empty($message_set) || (isset($to_idx)
-        && (int)$from_idx > (int)$to_idx)) {
+                && (int)$from_idx > (int)$to_idx)) {
                 return false;
         }
@@ -1318 +1328 @@
         if (!iil_C_Select($conn, $mailbox)) {
             return false;
-    }
+        }
     
         /* FETCH date,from,subject headers */
@@ -1339 +1349 @@
                 $id  = $header->id;
                 $new = array('id' => $id, 'MESSAGE-ID' => $header->mid, 
-            'IN-REPLY-TO' => $header->irt, 'SUBJECT' => $header->sbj);
+                        'IN-REPLY-TO' => $header->irt, 'SUBJECT' => $header->sbj);
 
                 /* add to message-id -> mid lookup table */
@@ -1355 +1365 @@
                     $has_re = true;
                 }
-        if ($has_re||$new['IN-REPLY-TO']) {
-            $sbj_pre = 'RE:';
+                if ($has_re||$new['IN-REPLY-TO']) {
+                    $sbj_pre = 'RE:';
                 }
         
@@ -1365 +1375 @@
                     $sbj = $new['SUBJECT'];
                 }
-        $new['SUBJECT'] = $sbj_pre.$sbj;
+                $new['SUBJECT'] = $sbj_pre.$sbj;
                 
                 
@@ -1372 +1382 @@
                     echo $id . ' ' . $new['SUBJECT'] . "\t" . $new['MESSAGE-ID'] . "\n";
                 }
-        $root_id = $roots[$sbj];
+                $root_id = $roots[$sbj];
                 
                 if ($root_id && ($has_re || !$root_in_root[$root_id])) {
@@ -1378 +1388 @@
                             echo "\tfound root: $root_id\n";
                         }
-            $sub_mids[$new['MESSAGE-ID']] = $root_id;
+                        $sub_mids[$new['MESSAGE-ID']] = $root_id;
                         $result[$root_id][]           = $id;
-                }else if (!isset($roots[$sbj]) || (!$has_re && $root_in_root[$root_id])) {
+                } else if (!isset($roots[$sbj]) || (!$has_re && $root_in_root[$root_id])) {
                         /* try to use In-Reply-To header to find root 
                                 unless subject contains 'Re:' */
@@ -1395 +1405 @@
                                             echo "\tfound parent: ".$new['SUBJECT']."\n";
                                         }
-                    $result[$temp][]              = $id;
+                                        $result[$temp][]              = $id;
                                         $sub_mids[$new['MESSAGE-ID']] = $temp;
                                         $sbj                          = '';
@@ -1409 +1419 @@
                                     echo "\t added to root\n";
                                 }
-                $roots[$sbj]                  = $id;
+                                $roots[$sbj]                  = $id;
                                 $root_in_root[$id]            = !$has_re;
                                 $sub_mids[$new['MESSAGE-ID']] = $id;
@@ -1416 +1426 @@
                         if ($debug) {
                             echo $new['MESSAGE-ID'] . "\t" . $sbj . "\n";
-            }
-                }
-                        
+                        }
+                }
         }
         
@@ -1429 +1438 @@
                             continue;
                         }
-            $result[$root_id] = array_merge($result[$root_id],$result[$id]);
+                        $result[$root_id] = array_merge($result[$root_id],$result[$id]);
                         unset($result[$id]);
                 }
@@ -1441 +1450 @@
             print_r($roots);
         }
-    //print_r($result);
+
         return $result;
 }
-
 
 function iil_SortThreads(&$tree, $index, $sort_order = 'ASC') {
         if (!is_array($tree) || !is_array($index)) {
             return false;
-    }
+        }
     
         //create an id to position lookup table
@@ -1486 +1494 @@
         }
         
-        
         //sort by key, this basically sorts all threads
         ksort($itree);
@@ -1496 +1503 @@
         }
         
-        //return
         return $out;
 }
@@ -1564 +1570 @@
         $request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
         $request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
-        $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])\r\n";
-
-        if (!fputs($fp, $request)) {
+        $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])";
+
+        if (!iil_PutLine($fp, $request)) {
                 return false;
         }
@@ -1697 +1703 @@
         $command_key = 'fh' . ($c++);
         $request     = $command_key . $prefix;
-        $request    .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n";
-        
-        if (!fputs($fp, $request)) {
+        $request    .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)";
+        
+        if (!iil_PutLine($fp, $request)) {
             return false;
         }
-    do {
+        do {
                 $line = chop(iil_ReadLine($fp, 200));
                 //$a = explode(' ', $line);
@@ -1757 +1763 @@
                                                         } else if (strcasecmp($val, "\$MDNSent") == 0) {
                                                             $result[$id]->mdn_sent = true;
-                            }
+                                                        }
                                                 }
                                                 $result[$id]->flags = $flags_a;
@@ -1813 +1819 @@
 }
 
-
 function iil_SortHeaders($a, $field, $flag) {
         if (empty($field)) {
             $field = 'uid';
-    }
+        }
         $field = strtolower($field);
         if ($field == 'date' || $field == 'internaldate') {
             $field = 'timestamp';
-    }
+        }
         if (empty($flag)) {
             $flag = 'ASC';
-    }
+        }
     
         $flag     = strtoupper($flag);
@@ -1847 +1852 @@
                                 if ($data == false) {
                                         $data = $val->timestamp;
-                }
+                                }
                         } else {
                                 $data = $val->$field;
                                 if (is_string($data)) {
                                         $data=strtoupper(str_replace($stripArr, '', $data));
-                }
+                                }
                         }
                         $index[$key]=$data;
@@ -1860 +1865 @@
                 $i = 0;
                 if ($flag == 'ASC') {
-                    asort($index);
-        } else {
-            arsort($index);
+                        asort($index);
+                } else {
+                        arsort($index);
                 }
         
@@ -1878 +1883 @@
 
 function iil_C_Expunge(&$conn, $mailbox) {
-        $fp = $conn->fp;
+
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                fputs($fp, "exp1 EXPUNGE\r\n");
+                iil_PutLine($conn->fp, "exp1 EXPUNGE");
                 do {
-                        $line=chop(iil_ReadLine($fp, 100));
+                        $line=chop(iil_ReadLine($conn->fp, 100));
                         if ($line[0] == '*') {
-                $c++;
-            }
+                                $c++;
+                        }
                 } while (!iil_StartsWith($line, 'exp1'));
                 
@@ -1920 +1925 @@
         if (iil_C_Select($conn, $mailbox)) {
                 $c = 0;
-                fputs($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n");
+                iil_PutLine($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")");
                 do {
                         $line=chop(iil_ReadLine($fp, 100));
                         if ($line[0] == '*') {
                             $c++;
-            }
+                        }
                 } while (!iil_StartsWith($line, 'flg'));
 
@@ -1959 +1964 @@
 }
 
-
 function iil_C_Copy(&$conn, $messages, $from, $to) {
         $fp = $conn->fp;
@@ -1965 +1969 @@
         if (empty($from) || empty($to)) {
             return -1;
-    }
+        }
     
         if (iil_C_Select($conn, $from)) {
                 $c=0;
                 
-                fputs($fp, "cpy1 COPY $messages \"".iil_Escape($to)."\"\r\n");
+                iil_PutLine($fp, "cpy1 COPY $messages \"".iil_Escape($to)."\"");
                 $line=iil_ReadReply($fp);
                 return iil_ParseResult($line);
@@ -1980 +1984 @@
 function iil_FormatSearchDate($month, $day, $year) {
         $month  = (int) $month;
-    $months = $GLOBALS['IMAP_MONTHS'];
+        $months = $GLOBALS['IMAP_MONTHS'];
         return $day . '-' . $months[$month] . '-' . $year;
 }
@@ -1990 +1994 @@
                 if (empty($str)) {
                     return false;
-        }
+                }
                 return count($index);
         }
-    return false;
+        return false;
 }
 
@@ -2003 +2007 @@
                         if ($count > 1) {
                             return false;
-            }
+                        }
                         return $id_a[0];
                 }
@@ -2014 +2018 @@
         if ($id == 0) {
             return      -1;
-    }
-    $result = -1;
+        }
+        $result = -1;
         if (iil_C_Select($conn, $folder)) {
                 $key = 'FUID';
-                if (fputs($fp, "$key FETCH $id (UID)\r\n")) {
+                if (iil_PutLine($fp, "$key FETCH $id (UID)")) {
                         do {
                                 $line=chop(iil_ReadLine($fp, 1024));
@@ -2035 +2039 @@
                 $c = 0;
                 
-                $query = 'srch1 SEARCH ' . chop($criteria) . "\r\n";
-                fputs($fp, $query);
+                $query = 'srch1 SEARCH ' . chop($criteria);
+                iil_PutLine($fp, $query);
                 do {
                         $line=trim(iil_ReadLine($fp, 10000));
@@ -2050 +2054 @@
                 }
                 $conn->error = 'iil_C_Search: ' . $line . "\n";
-                return false;
-                
+                return false;   
         }
         $conn->error = "iil_C_Search: Couldn't select \"$folder\"\n";
@@ -2089 +2092 @@
         
         //try (LIST "" ""), should return delimiter (RFC2060 Sec 6.3.8)
-        if (!fputs($fp, 'ghd LIST "" ""' . "\r\n")) {
+        if (!iil_PutLine($fp, 'ghd LIST "" ""')) {
             return false;
-    }
+        }
     
         do {
@@ -2100 +2103 @@
                         if ($a[0] == '*') {
                             $delimiter = str_replace('"', '', $a[count($a)-2]);
-            }
+                        }
                 }
         } while (!iil_StartsWith($line, 'ghd'));
@@ -2110 +2113 @@
         //if that fails, try namespace extension
         //try to fetch namespace data
-        fputs($conn->fp, "ns1 NAMESPACE\r\n");
+        iil_PutLine($conn->fp, "ns1 NAMESPACE");
         do {
                 $line = iil_ReadLine($conn->fp, 1024);
@@ -2133 +2136 @@
         if (!is_array($first_userspace)) {
             return false;
-    }
+        }
     
         //extract delimiter
@@ -2157 +2160 @@
     
         // send command
-        if (!fputs($fp, "lmb LIST \"".$ref."\" \"".iil_Escape($mailbox)."\"\r\n")) {
+        if (!iil_PutLine($fp, "lmb LIST \"".$ref."\" \"".iil_Escape($mailbox)."\"")) {
             return false;
         }
@@ -2170 +2173 @@
                 if (($line[0] == '*') && ($a[1] == 'LIST')) {
                         $line = rtrim($line);
-            // split one line
+                        // split one line
                         $a = iil_ExplodeQuotedString(' ', $line);
-            // last string is folder name
+                        // last string is folder name
                         $folder = trim($a[count($a)-1], '"');
             
-            if (empty($ignore) || (!empty($ignore)
-                && !eregi($ignore, $folder))) {
-                $folders[$i] = $folder;
-            }
+                        if (empty($ignore) || (!empty($ignore)
+                                && !eregi($ignore, $folder))) {
+                                $folders[$i] = $folder;
+                        }
             
-            // second from last is delimiter
-            $delim = trim($a[count($a)-2], '"');
-            // is it a container?
-            $i++;
+                        // second from last is delimiter
+                        $delim = trim($a[count($a)-2], '"');
+                        // is it a container?
+                        $i++;
                 }
         } while (!iil_StartsWith($line, 'lmb'));
@@ -2189 +2192 @@
         if (is_array($folders)) {
             if (!empty($ref)) {
-            // if rootdir was specified, make sure it's the first element
-            // some IMAP servers (i.e. Courier) won't return it
-            if ($ref[strlen($ref)-1]==$delim)
+                // if rootdir was specified, make sure it's the first element
+                // some IMAP servers (i.e. Courier) won't return it
+                if ($ref[strlen($ref)-1]==$delim)
                     $ref = substr($ref, 0, strlen($ref)-1);
-            if ($folders[0]!=$ref)
+                if ($folders[0]!=$ref)
                     array_unshift($folders, $ref);
             }
             return $folders;
-        }else if (iil_ParseResult($line) == 0) {
+        } else if (iil_ParseResult($line) == 0) {
                 return array('INBOX');
         } else {
@@ -2205 +2208 @@
 }
 
-
 function iil_C_ListSubscribed(&$conn, $ref, $mailbox) {
         global $IGNORE_FOLDERS;
@@ -2220 +2222 @@
         $folders = array();
 
-    // send command
-        if (!fputs($fp, 'lsb LSUB "' . $ref . '" "' . iil_Escape($mailbox).'"' . "\r\n")) {
+        // send command
+        if (!iil_PutLine($fp, 'lsb LSUB "' . $ref . '" "' . iil_Escape($mailbox).'"')) {
                 $conn->error = "Couldn't send LSUB command\n";
                 return false;
@@ -2228 +2230 @@
         $i = 0;
         
-    // get folder list
+        // get folder list
         do {
                 $line = iil_ReadLine($fp, 500);
@@ -2237 +2239 @@
                         $line = rtrim($line);
             
-            // split one line
+                        // split one line
                         $a = iil_ExplodeQuotedString(' ', $line);
             
-            // last string is folder name
-            //$folder = UTF7DecodeString(str_replace('"', '', $a[count($a)-1]));
-            $folder = trim($a[count($a)-1], '"');
+                        // last string is folder name
+                        //$folder = UTF7DecodeString(str_replace('"', '', $a[count($a)-1]));
+                        $folder = trim($a[count($a)-1], '"');
             
                         if ((!in_array($folder, $folders)) && (empty($ignore)
-                || (!empty($ignore) && !eregi($ignore, $folder)))) {
+                                || (!empty($ignore) && !eregi($ignore, $folder)))) {
                             $folders[$i] = $folder;
-            }
+                        }
             
-            // second from last is delimiter
-            $delim = trim($a[count($a)-2], '"');
+                        // second from last is delimiter
+                        $delim = trim($a[count($a)-2], '"');
             
-            // is it a container?
-            $i++;
+                        // is it a container?
+                        $i++;
                 }
         } while (!iil_StartsWith($line, 'lsb'));
 
         if (is_array($folders)) {
-        if (!empty($ref)) {
-            // if rootdir was specified, make sure it's the first element
-            // some IMAP servers (i.e. Courier) won't return it
-            if ($ref[strlen($ref)-1]==$delim) {
-                $ref = substr($ref, 0, strlen($ref)-1);
-            }
-            if ($folders[0]!=$ref) {
-                array_unshift($folders, $ref);
-            }
-        }
-        return $folders;
+            if (!empty($ref)) {
+                // if rootdir was specified, make sure it's the first element
+                // some IMAP servers (i.e. Courier) won't return it
+                if ($ref[strlen($ref)-1]==$delim) {
+                    $ref = substr($ref, 0, strlen($ref)-1);
+                }
+                if ($folders[0]!=$ref) {
+                    array_unshift($folders, $ref);
+                }
+            }
+            return $folders;
         }
         $conn->error = $line;
@@ -2274 +2276 @@
 }
 
-
 function iil_C_Subscribe(&$conn, $folder) {
         $fp = $conn->fp;
 
-        $query = 'sub1 SUBSCRIBE "' . iil_Escape($folder). '"' . "\r\n";
-        fputs($fp, $query);
+        $query = 'sub1 SUBSCRIBE "' . iil_Escape($folder). '"';
+        iil_PutLine($fp, $query);
 
         $line = trim(iil_ReadLine($fp, 10000));
@@ -2285 +2286 @@
 }
 
-
 function iil_C_UnSubscribe(&$conn, $folder) {
         $fp = $conn->fp;
 
-        $query = 'usub1 UNSUBSCRIBE "' . iil_Escape($folder) . '"' . "\r\n";
-        fputs($fp, $query);
+        $query = 'usub1 UNSUBSCRIBE "' . iil_Escape($folder) . '"';
+        iil_PutLine($fp, $query);
     
         $line = trim(iil_ReadLine($fp, 10000));
         return iil_ParseResult($line);
 }
-
 
 function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $part) {
@@ -2302 +2301 @@
         if (($part == 0) || (empty($part))) {
             $part = 'HEADER';
-    } else {
-        $part .= '.MIME';
+        } else {
+            $part .= '.MIME';
         }
     
         if (iil_C_Select($conn, $mailbox)) {
                 $key     = 'fh' . ($c++);
-                $request = $key . " FETCH $id (BODY.PEEK[$part])\r\n";
-                if (!fputs($fp, $request)) return false;
+                $request = $key . " FETCH $id (BODY.PEEK[$part])";
+                if (!iil_PutLine($fp, $request)) return false;
                 do {
                         $line = chop(iil_ReadLine($fp, 200));
@@ -2327 +2326 @@
 }
 
-
 function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
-    /* modes:
+        /* modes:
         1: return string
         2: print
         3: base64 and print
-    */
+        */
+        
         $fp     = $conn->fp;
         $result = false;
@@ -2341 +2340 @@
     
         if (iil_C_Select($conn, $mailbox)) {
-        $reply_key = '* ' . $id;
+                $reply_key = '* ' . $id;
         
-        // format request
+                // format request
                 $key     = 'ftch' . ($c++) . ' ';
-                $request = $key . "FETCH $id (BODY.PEEK[$part])\r\n";
-        // send request
-                if (!fputs($fp, $request)) {
+                $request = $key . "FETCH $id (BODY.PEEK[$part])";
+                // send request
+                if (!iil_PutLine($fp, $request)) {
                     return false;
-        }
+                }
         
-        // receive reply line
-        do {
-            $line = chop(iil_ReadLine($fp, 1000));
-            $a    = explode(' ', $line);
-        } while ($a[2] != 'FETCH');
-        $len = strlen($line);
-        if ($line[$len-1] == ')') {
-            //one line response, get everything between first and last quotes
-            if (substr($line, -4, 3) == 'NIL') {
-                // NIL response
-                $result = '';
-            } else {
-                $from = strpos($line, '"') + 1;
-                $to   = strrpos($line, '"');
-                $len  = $to - $from;
-                $result = substr($line, $from, $len);
-            }
+                // receive reply line
+                do {
+                        $line = chop(iil_ReadLine($fp, 1000));
+                        $a    = explode(' ', $line);
+                } while ($a[2] != 'FETCH');
+                $len = strlen($line);
+    
+                if ($line[$len-1] == ')') {
+                        // one line response, get everything between first and last quotes
+                        if (substr($line, -4, 3) == 'NIL') {
+                                // NIL response
+                                $result = '';
+                        } else {
+                                $from = strpos($line, '"') + 1;
+                                $to   = strrpos($line, '"');
+                                $len  = $to - $from;
+                                $result = substr($line, $from, $len);
+                        }
             
-            if ($mode == 2) {
-                echo $result;
-            } else if ($mode == 3) {
-                echo base64_decode($result);
-            }
-        } else if ($line[$len-1] == '}') {
-            //multi-line request, find sizes of content and receive that many bytes
-            $from     = strpos($line, '{') + 1;
-            $to       = strrpos($line, '}');
-            $len      = $to - $from;
-            $sizeStr  = substr($line, $from, $len);
-            $bytes    = (int)$sizeStr;
-            $received = 0;
-            while ($received < $bytes) {
-                $remaining = $bytes - $received;
-                $line      = iil_ReadLine($fp, 1024);
-                $len       = strlen($line);
+                        if ($mode == 2) {
+                                echo $result;
+                        } else if ($mode == 3) {
+                                echo base64_decode($result);
+                        }
+                } else if ($line[$len-1] == '}') {
+                        //multi-line request, find sizes of content and receive that many bytes
+                        $from     = strpos($line, '{') + 1;
+                        $to       = strrpos($line, '}');
+                        $len      = $to - $from;
+                        $sizeStr  = substr($line, $from, $len);
+                        $bytes    = (int)$sizeStr;
+                        $received = 0;
+
+                        while ($received < $bytes) {
+                                $remaining = $bytes - $received;
+                                $line      = iil_ReadLine($fp, 1024);
+                                $len       = strlen($line);
                 
-                if ($len > $remaining) {
-                    $line = substr($line, 0, $remaining);
-                }
-                $received += strlen($line);
-                if ($mode == 1) {
-                    $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
-                } else if ($mode == 2) {
-                    echo rtrim($line, "\t\r\n\0\x0B") . "\n"; flush();
-                } else if ($mode == 3) {
-                    echo base64_decode($line); flush();
-                }
-            }
-        }
-        // read in anything up until 'til last line
+                                if ($len > $remaining) {
+                                        $line = substr($line, 0, $remaining);
+                                }
+                                $received += strlen($line);
+                                if ($mode == 1) {
+                                        $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
+                                } else if ($mode == 2) {
+                                        echo rtrim($line, "\t\r\n\0\x0B") . "\n"; flush();
+                                } else if ($mode == 3) {
+                                        echo base64_decode($line); flush();
+                                }
+                        }
+                }
+                // read in anything up until 'til last line
                 do {
-            $line = iil_ReadLine($fp, 1024);
+                        $line = iil_ReadLine($fp, 1024);
                 } while (!iil_StartsWith($line, $key));
         
-        if ($result) {
-            $result = rtrim($result, "\t\r\n\0\x0B");
-            return $result; // substr($result, 0, strlen($result)-1);
-        }
-        return false;
+                if ($result) {
+                        $result = rtrim($result, "\t\r\n\0\x0B");
+                        return $result; // substr($result, 0, strlen($result)-1);
+                }
+                
+                return false;
         } else {
                 echo 'Select failed.';
         }
     
-    if ($mode==1) {
-        return $result;
-    }
-    return $received;
+        if ($mode==1) {
+                return $result;
+        }
+        return $received;
 }
 
 function iil_C_FetchPartBody(&$conn, $mailbox, $id, $part) {
-    return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1);
+        return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1);
 }
 
 function iil_C_PrintPartBody(&$conn, $mailbox, $id, $part) {
-    iil_C_HandlePartBody($conn, $mailbox, $id, $part, 2);
+        iil_C_HandlePartBody($conn, $mailbox, $id, $part, 2);
 }
 
 function iil_C_PrintBase64Body(&$conn, $mailbox, $id, $part) {
-    iil_C_HandlePartBody($conn, $mailbox, $id, $part, 3);
+        iil_C_HandlePartBody($conn, $mailbox, $id, $part, 3);
 }
 
 function iil_C_CreateFolder(&$conn, $folder) {
         $fp = $conn->fp;
-        if (fputs($fp, 'c CREATE "' . iil_Escape($folder) . '"' . "\r\n")) {
+        if (iil_PutLine($fp, 'c CREATE "' . iil_Escape($folder) . '"')) {
                 do {
                         $line=iil_ReadLine($fp, 300);
@@ -2446 +2448 @@
 function iil_C_RenameFolder(&$conn, $from, $to) {
         $fp = $conn->fp;
-        if (fputs($fp, 'r RENAME "' . iil_Escape($from) . '" "' . iil_Escape($to) . '"' . "\r\n")) {
+        if (iil_PutLine($fp, 'r RENAME "' . iil_Escape($from) . '" "' . iil_Escape($to) . '"')) {
                 do {
                         $line = iil_ReadLine($fp, 300);
@@ -2452 +2454 @@
                 return (iil_ParseResult($line) == 0);
         }
-    return false;
+        return false;
 }
 
 function iil_C_DeleteFolder(&$conn, $folder) {
         $fp = $conn->fp;
-        if (fputs($fp, 'd DELETE "' . iil_Escape($folder). '"' . "\r\n")) {
+        if (iil_PutLine($fp, 'd DELETE "' . iil_Escape($folder). '"')) {
                 do {
                         $line=iil_ReadLine($fp, 300);
@@ -2463 +2465 @@
                 return (iil_ParseResult($line) == 0);
         }
-    $conn->error = "Couldn't send command\n";
+        $conn->error = "Couldn't send command\n";
         return false;
 }
@@ -2469 +2471 @@
 function iil_C_Append(&$conn, $folder, &$message) {
         if (!$folder) {
-        return false;
-    }
+                return false;
+        }
         $fp = $conn->fp;
 
@@ -2478 +2480 @@
         $len = strlen($message);
         if (!$len) {
-        return false;
-        }
-        $request = 'A APPEND "' . iil_Escape($folder) .'" (\\Seen) {' . $len . "}\r\n";
-    
-        if (fputs($fp, $request)) {
+                return false;
+        }
+
+        $request = 'A APPEND "' . iil_Escape($folder) .'" (\\Seen) {' . $len . '}';
+    
+        if (iil_PutLine($fp, $request)) {
                 $line=iil_ReadLine($fp, 100);           
                 $sent = fwrite($fp, $message."\r\n");
@@ -2492 +2495 @@
                 if (!$result) {
                     $conn->error .= $line . "\n";
-        }
+                }
                 return $result;
-        
-        }
+        }
+
         $conn->error .= "Couldn't send command \"$request\"\n";
-    return false;
-}
-
+        return false;
+}
 
 function iil_C_AppendFromFile(&$conn, $folder, $path) {
@@ -2509 +2511 @@
         $in_fp = false;                         
         if (file_exists(realpath($path))) {
-            $in_fp = fopen($path, 'r');
-    }
+                $in_fp = fopen($path, 'r');
+        }
         if (!$in_fp) { 
                 $conn->error .= "Couldn't open $path for reading\n";
@@ -2519 +2521 @@
         $len = filesize($path);
         if (!$len) {
-            return false;
+                return false;
         }
     
         //send APPEND command
-        $request    = 'A APPEND "' . iil_Escape($folder) . '" (\\Seen) {' . $len . "}\r\n";
+        $request    = 'A APPEND "' . iil_Escape($folder) . '" (\\Seen) {' . $len . '}';
         $bytes_sent = 0;
-        if (fputs($fp, $request)) {
+        if (iil_PutLine($fp, $request)) {
                 $line = iil_ReadLine($fp, 100);
                                 
@@ -2532 +2534 @@
                         $buffer      = fgets($in_fp, 4096);
                         $bytes_sent += strlen($buffer);
-                        fputs($fp, $buffer);
+                        iil_PutLine($fp, $buffer, false);
                 }
                 fclose($in_fp);
 
-                fputs($fp, "\r\n");
+                iil_PutLine($fp, '');
 
                 //read response
@@ -2547 +2549 @@
                     $conn->error .= $line . "\n";
                 }
-        return $result;
-        
-        }
+        
+                return $result;
+        }
+        
         $conn->error .= "Couldn't send command \"$request\"\n";
         return false;
 }
-
 
 function iil_C_FetchStructureString(&$conn, $folder, $id) {
@@ -2562 +2564 @@
                 $key = 'F1247';
         
-                if (fputs($fp, "$key FETCH $id (BODYSTRUCTURE)\r\n")) {
+                if (iil_PutLine($fp, "$key FETCH $id (BODYSTRUCTURE)")) {
                         do {
                                 $line = iil_ReadLine($fp, 5000);
@@ -2569 +2571 @@
                         } while (!preg_match("/^$key/", $line));
 
-                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)-2)));
+                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, 
+                                    -(strlen($result)-strrpos($result, $key)-2)));
                 }
         }
@@ -2594 +2597 @@
         
         //get line containing quota info
-        if (fputs($fp, 'QUOT1 GETQUOTAROOT "INBOX"' . "\r\n")) {
+        if (iil_PutLine($fp, 'QUOT1 GETQUOTAROOT "INBOX"')) {
                 do {
                         $line=chop(iil_ReadLine($fp, 5000));
                         if (iil_StartsWith($line, '* QUOTA ')) {
-                            $quota_line = $line;
-            }
+                                $quota_line = $line;
+                        }
                 } while (!iil_StartsWith($line, 'QUOT1'));
         }
@@ -2622 +2625 @@
 }
 
-
 function iil_C_ClearFolder(&$conn, $folder) {
         $num_in_trash = iil_C_CountMessages($conn, $folder);
         if ($num_in_trash > 0) {
-            iil_C_Delete($conn, $folder, '1:' . $num_in_trash);
-    }
+                iil_C_Delete($conn, $folder, '1:' . $num_in_trash);
+        }
         return (iil_C_Expunge($conn, $folder) >= 0);
 }