From 4bac28966359c8278d058b50852e0ddb5565cd9a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 11 Jul 2009 17:53:11 -0400
Subject: [PATCH] - small code improvements
---
program/lib/imap.inc | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index d840bef..f6c6abe 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -199,7 +199,7 @@
function iil_PutLine($fp, $string, $endln=true) {
global $my_prefs;
- if(!empty($my_prefs['debug_mode']))
+ if (!empty($my_prefs['debug_mode']))
write_log('imap', 'C: '. rtrim($string));
return fputs($fp, $string . ($endln ? "\r\n" : ''));
@@ -246,7 +246,7 @@
if ($buffer === false) {
break;
}
- if(!empty($my_prefs['debug_mode']))
+ if (!empty($my_prefs['debug_mode']))
write_log('imap', 'S: '. chop($buffer));
$line .= $buffer;
} while ($buffer[strlen($buffer)-1] != "\n");
@@ -277,13 +277,14 @@
$len = 0;
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);
return $data;
@@ -328,7 +329,7 @@
return false;
}
-function iil_StartsWithI($string, $match, $bye=false) {
+function iil_StartsWithI($string, $match, $error=false) {
$len = strlen($match);
if ($len == 0) {
return false;
@@ -336,7 +337,7 @@
if (strncasecmp($string, $match, $len) == 0) {
return true;
}
- if ($bye && strncmp($string, '* BYE ', 6) == 0) {
+ if ($error && preg_match('/^\* (BYE|BAD) /i', $string)) {
return true;
}
@@ -791,7 +792,7 @@
if (strcasecmp($a[2], 'EXISTS') == 0) {
$conn->exists = (int) $a[1];
}
- if (strcasecmp($a[2], 'RECENT') == 0) {
+ else if (strcasecmp($a[2], 'RECENT') == 0) {
$conn->recent = (int) $a[1];
}
}
@@ -892,7 +893,7 @@
$command = 's ' . $is_uid . 'SORT (' . $field . ') ';
$command .= $encoding . ' ALL' . $add;
$line = $data = '';
-
+
if (!iil_PutLineC($conn->fp, $command)) {
return false;
}
@@ -2265,15 +2266,16 @@
$sizeStr = substr($line, $from, $len);
$bytes = (int)$sizeStr;
$prev = '';
-
+
while ($bytes > 0) {
$line = iil_ReadLine($fp, 1024);
$len = strlen($line);
if ($len > $bytes) {
$line = substr($line, 0, $bytes);
+ $len = strlen($line);
}
- $bytes -= strlen($line);
+ $bytes -= $len;
if ($mode == 1) {
$line = rtrim($line, "\t\r\n\0\x0B");
@@ -2352,7 +2354,6 @@
do {
$line=iil_ReadLine($fp, 300);
} while ($line[0] != 'c');
- $conn->error = $line;
return (iil_ParseResult($line) == 0);
}
return false;
@@ -2377,7 +2378,6 @@
} while ($line[0] != 'd');
return (iil_ParseResult($line) == 0);
}
- $conn->error = "Couldn't send command\n";
return false;
}
--
Gitblit v1.9.1