X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=2e216e4d8063fbdda0706783c3d4c2639a601173;hb=61d9e88594284a19469c122a527b31b493a5dc0a;hp=f40bbdb75db972bd5d3ce4aea19125f952334e6e;hpb=7379b349cb00371a0f1f3c74846cc8ec5bc9bea7;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index f40bbdb7..2e216e4d 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,10 +3,11 @@
** imap.php
**
** This implements all functions that do general imap functions.
+ **
+ ** $Id$
**/
$imap_general_debug = false;
- //$imap_general_debug = false;
/******************************************************************************
** Reads the output from the IMAP stream. If handle_errors is set to true,
@@ -16,20 +17,72 @@
function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
global $color, $squirrelmail_language, $imap_general_debug;
- $counter = 0;
- do {
- $data[$counter] = $read = fgets ($imap_stream, 4096);
- if ($imap_general_debug) { echo "$read
"; flush(); }
- $counter++;
- } while (! ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs));
+ $read = fgets($imap_stream, 9096);
+
+ if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+ $size = $regs[1];
+ } else {
+ $size = 0;
+ }
+
+ $data = array();
+ $total_size = 0;
+
+ $continue = true;
+ while ($continue) {
+ // Continue if needed for this single line
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ // For debugging purposes
+ if ($imap_general_debug) {
+ echo "$read
\n";
+ flush();
+ }
+
+
+ // If we know the size, no need to look at the end parameters
+ if ($size > 0) {
+ if ($total_size == $size) {
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ while (!ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
+ $read = fgets($imap_stream, 9096);
+ }
+ $continue = false;
+ } else if ($total_size > $size) {
+ $difference = $total_size - $size;
+ $total_size = $total_size - strlen($read);
+ $read = substr ($read, 0, strlen($read)-$difference);
+ $data[] = $read;
+ $junk = fgets($imap_stream, 9096);
+ $continue = false;
+ } else {
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ }
+ $total_size += strlen($read);
+ } else {
+ if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
+ $continue = false;
+ } else {
+ $data[] = $read;
+ $read = fgets ($imap_stream, 9096);
+ }
+ }
+ }
$response = $regs[1];
$message = trim($regs[2]);
- if ($imap_general_debug) echo "--
";
+ if ($imap_general_debug) echo '--
';
- if ($handle_errors == true) {
- if ($response == "NO") {
+ if ($handle_errors == false)
+ return $data;
+
+ if ($response == 'NO') {
+ // ignore this error from m$ exchange, it is not fatal (aka bug)
+ if (!ereg('command resulted in',$message)) {
set_up_language($squirrelmail_language);
echo "
\n";
echo _("ERROR : Could not complete request.");
@@ -37,15 +90,15 @@
echo _("Reason Given: ");
echo $message . "
\n";
exit;
- } else if ($response == "BAD") {
- set_up_language($squirrelmail_language);
- echo "
\n";
- echo _("ERROR : Bad or malformed request.");
- echo "
\n";
- echo _("Server responded: ");
- echo $message . "
\n";
- exit;
}
+ } else if ($response == 'BAD') {
+ set_up_language($squirrelmail_language);
+ echo "
\n";
+ echo _("ERROR : Bad or malformed request.");
+ echo "
\n";
+ echo _("Server responded: ");
+ echo $message . "
\n";
+ exit;
}
return $data;
@@ -58,7 +111,8 @@
function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
- $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string, 0);
+ $imap_stream = fsockopen ($imap_server_address, $imap_port,
+ $error_number, $error_string, 15);
$server_info = fgets ($imap_stream, 1024);
// Decrypt the password
@@ -75,20 +129,20 @@
}
fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) .
- "\" \"" . quotemeta($password) . "\"\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message);
+ '" "' . quotemeta($password) . "\"\r\n");
+ $read = sqimap_read_data ($imap_stream, 'a001', false, $response, $message);
/** If the connection was not successful, lets see why **/
if ($response != "OK") {
if (!$hide) {
- if ($response != "NO") {
+ if ($response != 'NO') {
// "BAD" and anything else gets reported here.
set_up_language($squirrelmail_language, true);
- if ($response == "BAD")
+ if ($response == 'BAD')
printf (_("Bad request: %s")."
\r\n", $message);
else
printf (_("Unknown error: %s") . "
\n", $message);
- echo "
";
+ echo '
';
echo _("Read data:") . "
\n";
if (is_array($read))
{
@@ -112,13 +166,13 @@
?>
-
+
- + |
+
|