X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=4909543926f948ceb319a3bb67adb24efe963b81;hb=bdfb67f8c88976632ff76bd2b40ad9c74f2c4136;hp=403e44ec1ca0f62210bbcea98e68bcb9d4c08f1b;hpb=862ff2d35e2c81bc8b672e1b136a723f831e00e1;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 403e44ec..49095439 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,86 +1,132 @@
$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);
- $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);
+ if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+ $size = $regs[1];
+ } else if (ereg("^\\* [0-9]+ FETCH", $read, $regs)) {
+ // Sizeless response, probably single-line
+ $size = -1;
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
} else {
- if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
- $continue = false;
+ $size = -1;
+ }
+ while (1) {
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ // If we know the size, no need to look at the end parameters
+ if ($size > 0) {
+ if ($total_size == $size) {
+ // We've reached the end of this 'message', switch to the next one.
+ $data[] = $read;
+ break;
+ } else if ($total_size > $size) {
+ $difference = $total_size - $size;
+ $total_size = $total_size - strlen($read);
+ $data[] = substr ($read, 0, strlen($read)-$difference);
+ $read = substr ($read, strlen($read)-$difference, strlen($read));
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
+ }
+ $total_size += strlen($read);
} else {
- $data[] = $read;
- $read = fgets ($imap_stream, 9096);
+ if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ (($size == -1) && ereg("^\\* [0-9]+ FETCH.*", $read, $regs))) {
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets ($imap_stream, 9096);
+ }
}
}
- }
+ while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
+ !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ $read = fgets($imap_stream, 9096);
+ }
+ $resultlist[] = $data;
+ }
$response = $regs[1];
$message = trim($regs[2]);
- if ($imap_general_debug) echo "--
";
-
- if ($handle_errors == false)
- return $data;
+ if ($handle_errors == false) { return $resultlist; }
- if ($response == "NO") {
+ if ($response == 'NO') {
// ignore this error from m$ exchange, it is not fatal (aka bug)
- if (!ereg("command resulted in",$message)) {
+ if (strstr($message, 'command resulted in') === false) {
set_up_language($squirrelmail_language);
echo "
\n";
echo _("ERROR : Could not complete request.");
@@ -89,7 +135,7 @@
echo $message . "
\n";
exit;
}
- } else if ($response == "BAD") {
+ } else if ($response == 'BAD') {
set_up_language($squirrelmail_language);
echo "
\n";
echo _("ERROR : Bad or malformed request.");
@@ -98,21 +144,26 @@
echo $message . "
\n";
exit;
}
-
- return $data;
+ return $resultlist;
}
-
+
+ function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+ $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message);
+ return $res[0];
+ }
+
/******************************************************************************
** Logs the user into the imap server. If $hide is set, no error messages
** will be displayed. This function returns the imap connection handle.
******************************************************************************/
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, 15);
+ $imap_stream = fsockopen ( $imap_server_address, $imap_port,
+ $error_number, $error_string, 15);
$server_info = fgets ($imap_stream, 1024);
-
+
// Decrypt the password
$password = OneTimePadDecrypt($password, $onetimepad);
@@ -126,28 +177,28 @@
exit;
}
- fputs ($imap_stream, "a001 LOGIN \"" . quotemeta($username) .
- "\" \"" . quotemeta($password) . "\"\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", false, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . ' LOGIN "' . quoteIMAP($username) .
+ '" "' . quoteIMAP($password) . "\"\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), 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))
- {
- foreach ($read as $line)
- {
- echo htmlspecialchars($line) . "
\n";
- }
+ if (is_array($read))
+ {
+ foreach ($read as $line)
+ {
+ echo htmlspecialchars($line) . "
\n";
+ }
}
exit;
} else {
@@ -159,18 +210,18 @@
// $squirrelmail_language is set by a cookie when
// the user selects language and logs out
-
+
set_up_language($squirrelmail_language, true);
-
+
?>
-
+
- + |
+
|