Ticket #1485080: imap.patch

program/lib/imap.inc

@@ -211 +211 @@
 
 function iil_ReadReply($fp) {
         do {
-                $line = chop(trim(iil_ReadLine($fp, 1024)));
+                $line = trim(iil_ReadLine($fp, 1024));
         } while ($line[0] == '*');
         
         return $line;
@@ -486 +486 @@
 //      } else {
                 fputs($conn->fp, "cp01 CAPABILITY\r\n");
                 do {
-                        $line = trim(chop(iil_ReadLine($conn->fp, 100)));
+                        $line = trim(iil_ReadLine($conn->fp, 100));
 
                         $conn->message .= "$line\n";
 
@@ -520 +520 @@
 
                 //do CRAM-MD5 authentication
                 fputs($conn->fp, "a000 AUTHENTICATE CRAM-MD5\r\n");
-                $line = trim(chop(iil_ReadLine($conn->fp, 1024)));
+                $line = trim(iil_ReadLine($conn->fp, 1024));
         
                 $conn->message .= "$line\n";
         
@@ -1577 +1577 @@
                         do {
                                 $line = chop(iil_ReadLine($fp, 300), "\r\n");
                                 if (ord($line[0])<=32) {
-                                    $lines[$i] .= (empty($lines[$i])?'':"\n").trim(chop($line));
+                                    $lines[$i] .= (empty($lines[$i])?'':"\n").trim($line);
                                 } else {
                                         $i++;
-                                        $lines[$i] = trim(chop($line));
+                                        $lines[$i] = trim($line);
                                 }
                                 /* 
                                         The preg_match below works around communigate imap, which outputs " UID <number>)".
@@ -2025 +2025 @@
                 $query = 'srch1 SEARCH ' . chop($criteria) . "\r\n";
                 fputs($fp, $query);
                 do {
-                        $line=trim(chop(iil_ReadLine($fp, 10000)));
+                        $line=trim(iil_ReadLine($fp, 10000));
                         if (eregi("^\* SEARCH", $line)) {
                                 $str = trim(substr($line, 8));
                                 $messages = explode(' ', $str);
@@ -2266 +2266 @@
         $query = 'sub1 SUBSCRIBE "' . $folder. '"' . "\r\n";
         fputs($fp, $query);
 
-        $line = trim(chop(iil_ReadLine($fp, 10000)));
+        $line = trim(iil_ReadLine($fp, 10000));
         return iil_ParseResult($line);
 }
 
@@ -2277 +2277 @@
         $query = 'usub1 UNSUBSCRIBE "' . $folder . '"' . "\r\n";
         fputs($fp, $query);
     
-        $line = trim(chop(iil_ReadLine($fp, 10000)));
+        $line = trim(iil_ReadLine($fp, 10000));
         return iil_ParseResult($line);
 }
 
@@ -2301 +2301 @@
                         if (($line[0] == '*') && ($a[2] == 'FETCH')
                 && ($line[strlen($line)-1] != ')')) {
                                 $line=iil_ReadLine($fp, 300);
-                                while (chop($line) != ')') {
+                                while (trim($line) != ')') {
                                         $result .= $line;
                                         $line=iil_ReadLine($fp, 300);
                                 }