From 5f571eb1dba01a5f257c52978f30cd53d773d15c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 11 Jul 2009 16:29:34 -0400
Subject: [PATCH] - few fixes for last commits
---
program/lib/imap.inc | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index 0ab2b7f..d840bef 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -2249,7 +2249,7 @@
$len = $to - $from;
$result = substr($line, $from, $len);
}
-
+
if ($mode == 1)
$result = base64_decode($result);
else if ($mode == 2)
@@ -2265,7 +2265,7 @@
$sizeStr = substr($line, $from, $len);
$bytes = (int)$sizeStr;
$prev = '';
-
+
while ($bytes > 0) {
$line = iil_ReadLine($fp, 1024);
$len = strlen($line);
@@ -2329,7 +2329,7 @@
do {
$line = iil_ReadLine($fp, 1024);
} while (!iil_StartsWith($line, $key, true));
-
+
if ($result) {
$result = rtrim($result, "\t\r\n\0\x0B");
if ($file) {
@@ -2338,9 +2338,9 @@
echo $result;
} else
return $result; // substr($result, 0, strlen($result)-1);
+
+ return true;
}
-
- return true;
}
return false;
@@ -2480,12 +2480,11 @@
do {
$line = iil_ReadLine($fp, 5000);
$line = iil_MultLine($fp, $line);
- list(, $index, $cmd, $rest) = explode(' ', $line);
- if ($cmd != 'FETCH' || $index == $id || preg_match("/^$key/", $line))
+ if (!preg_match("/^$key/", $line))
$result .= $line;
} while (!preg_match("/^$key/", $line));
- $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)+1)));
+ $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -1));
}
}
return $result;
--
Gitblit v1.9.1