X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=f4acc08c642574d3d080d5462df50262224a10d8;hb=943292e4d8df9faec0129b60227c5562564be6f8;hp=c97bf43ddec03795610d3dba28727ec589569d03;hpb=d17b1a714665bb8817373d5941ca53935944ca8c;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index c97bf43d..f4acc08c 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,103 +1,217 @@
-
+$read
\n";
+ flush();
+ }
+ $size = 0;
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ } else {
+ $size = 0;
+ }
+ while (1) {
+ 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) {
+ // 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 {
+ if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ 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 == true) {
- if ($response == "NO") {
- echo "
";
+ if ($handle_errors == false)
+ return $resultlist;
+
+ if ($response == 'NO') {
+ // ignore this error from m$ exchange, it is not fatal (aka bug)
+ if (strstr($message, 'command resulted in') === false) {
+ set_up_language($squirrelmail_language);
+ echo "
\n";
echo _("ERROR : Could not complete request.");
- echo "
";
+ echo "
\n";
echo _("Reason Given: ");
- echo "$message
";
- exit;
- } else if ($response == "BAD") {
- echo "
";
- echo _("ERROR : Bad or malformed request.");
- echo "
";
- echo _("Server responded: ");
- echo "$message
";
+ 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;
+ 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, $hide) {
- global $color;
- $imap_stream = fsockopen ($imap_server_address, 143, &$error_number, &$error_string);
+ 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);
$server_info = fgets ($imap_stream, 1024);
+ // Decrypt the password
+ $password = OneTimePadDecrypt($password, $onetimepad);
+
/** Do some error correction **/
if (!$imap_stream) {
if (!$hide) {
- echo "Error connecting to IMAP server: $imap_server_address.
\r\n";
+ set_up_language($squirrelmail_language, true);
+ printf (_("Error connecting to IMAP server: %s.")."
\r\n", $imap_server_address);
echo "$error_number : $error_string
\r\n";
}
exit;
}
- fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n");
- $read = fgets ($imap_stream, 1024);
+ 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 (substr($read, 0, 7) != "a001 OK") {
+ if ($response != "OK") {
if (!$hide) {
- if (substr($read, 0, 8) == "a001 BAD") {
- echo "Bad request: $read
\r\n";
+ if ($response != 'NO') {
+ // "BAD" and anything else gets reported here.
+ set_up_language($squirrelmail_language, true);
+ if ($response == 'BAD')
+ printf (_("Bad request: %s")."
\r\n", $message);
+ else
+ printf (_("Unknown error: %s") . "
\n", $message);
+ echo '
';
+ echo _("Read data:") . "
\n";
+ if (is_array($read))
+ {
+ foreach ($read as $line)
+ {
+ echo htmlspecialchars($line) . "
\n";
+ }
+ }
exit;
- } else if (substr($read, 0, 7) == "a001 NO") {
+ } else {
+ // If the user does not log in with the correct
+ // username and password it is not possible to get the
+ // correct locale from the user's preferences.
+ // Therefore, apply the same hack as on the login
+ // screen.
+
+ // $squirrelmail_language is set by a cookie when
+ // the user selects language and logs out
+
+ set_up_language($squirrelmail_language, true);
+
?>
-
- + |
+
|
@@ -105,8 +219,8 @@
- echo _("Click here to try again") ?> + + |