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

Timestamp:

Jul 11, 2009 5:53:11 PM (4 years ago)

Author:

alec

Message:

• small code improvements

File:

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

trunk/roundcubemail/program/lib/imap.inc

@@ -200 +200 @@
         global $my_prefs;
         
-        if(!empty($my_prefs['debug_mode']))
+        if (!empty($my_prefs['debug_mode']))
                 write_log('imap', 'C: '. rtrim($string));
         
@@ -247 +247 @@
                         break;
                 }
-                if(!empty($my_prefs['debug_mode']))
+                if (!empty($my_prefs['debug_mode']))
                         write_log('imap', 'S: '. chop($buffer));
                 $line .= $buffer;
@@ -278 +278 @@
         do {
                 $d = fread($fp, $bytes-$len);
+                if (!empty($my_prefs['debug_mode']))
+                        write_log('imap', 'S: '. $d);
                 $data .= $d;
-                if ($len == strlen($data)) {
+                $data_len = strlen($data);
+                if ($len == $data_len) {
                         break; //nothing was read -> exit to avoid apache lockups
                 }
-                if(!empty($my_prefs['debug_mode']))
-                        write_log('imap', 'S: '. $d);
-                $len = strlen($data);
+                $len = $data_len;
         } while ($len < $bytes);
         
@@ -329 +330 @@
 }
 
-function iil_StartsWithI($string, $match, $bye=false) {
+function iil_StartsWithI($string, $match, $error=false) {
         $len = strlen($match);
         if ($len == 0) {
@@ -337 +338 @@
                 return true;
         }
-        if ($bye && strncmp($string, '* BYE ', 6) == 0) {
+        if ($error && preg_match('/^\* (BYE|BAD) /i', $string)) {
                 return true;
 
@@ -792 +793 @@
                                         $conn->exists = (int) $a[1];
                                 }
-                                if (strcasecmp($a[2], 'RECENT') == 0) {
+                                else if (strcasecmp($a[2], 'RECENT') == 0) {
                                         $conn->recent = (int) $a[1];
                                 }
@@ -893 +894 @@
         $command .= $encoding . ' ALL' . $add;
         $line     = $data = '';
-        
+
         if (!iil_PutLineC($conn->fp, $command)) {
             return false;
@@ -2266 +2267 @@
                         $bytes    = (int)$sizeStr;
                         $prev     = '';
-
+                        
                         while ($bytes > 0) {
                                 $line      = iil_ReadLine($fp, 1024);
@@ -2273 +2274 @@
                                 if ($len > $bytes) {
                                         $line = substr($line, 0, $bytes);
+                                        $len = strlen($line);
                                 }
-                                $bytes -= strlen($line);
+                                $bytes -= $len;
 
                                 if ($mode == 1) {
@@ -2353 +2355 @@
                         $line=iil_ReadLine($fp, 300);
                 } while ($line[0] != 'c');
-        $conn->error = $line;
                 return (iil_ParseResult($line) == 0);
         }
@@ -2378 +2379 @@
                 return (iil_ParseResult($line) == 0);
         }
-        $conn->error = "Couldn't send command\n";
         return false;
 }