Changeset 9b90b33 in github

Timestamp:

May 23, 2008 5:30:43 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

b183d3d

Parents:

e9320f8

Message:

• trim(chop()) replaced by trim() (#1485080)

File:

• program/lib/imap.inc (modified) (9 diffs)

program/lib/imap.inc

@@ -55 +55 @@
                 - RFC3501 [7.1] don't call CAPABILITY if was returned in server 
                   optional resposne in iil_Connect()
+                - trim(chop()) replaced by trim()
                 
 
@@ -212 +213 @@
 function iil_ReadReply($fp) {
         do {
-                $line = chop(trim(iil_ReadLine($fp, 1024)));
+                $line = trim(iil_ReadLine($fp, 1024));
         } while ($line[0] == '*');
         
@@ -487 +488 @@
                 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";
@@ -521 +522 @@
                 //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";
@@ -1578 +1579 @@
                                 $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);
                                 }
                                 /* 
@@ -2026 +2027 @@
                 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));
@@ -2267 +2268 @@
         fputs($fp, $query);
 
-        $line = trim(chop(iil_ReadLine($fp, 10000)));
+        $line = trim(iil_ReadLine($fp, 10000));
         return iil_ParseResult($line);
 }
@@ -2278 +2279 @@
         fputs($fp, $query);
     
-        $line = trim(chop(iil_ReadLine($fp, 10000)));
+        $line = trim(iil_ReadLine($fp, 10000));
         return iil_ParseResult($line);
 }
@@ -2302 +2303 @@
                 && ($line[strlen($line)-1] != ')')) {
                                 $line=iil_ReadLine($fp, 300);
-                                while (chop($line) != ')') {
+                                while (trim($line) != ')') {
                                         $result .= $line;
                                         $line=iil_ReadLine($fp, 300);