X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_general.php;h=674896fbb40f8307886169e96963b92229cde955;hb=3b7e638f706db7c22631b55d654c883ce20c7e15;hp=c91c3ec1381775b6cc2e7af489da446b0d8f957d;hpb=d9ca5b409fd27d7b000f382ae93f3bacbabb5f59;p=squirrelmail.git
diff --git a/functions/imap_general.php b/functions/imap_general.php
index c91c3ec1..674896fb 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -3,65 +3,122 @@
** imap.php
**
** This implements all functions that do general imap functions.
+ **
+ ** $Id$
**/
- $imap_general_debug = false;
+ if (defined ('imap_general_php'))
+ return;
+ define ('imap_general_php', true);
+
+global $imap_general_debug;
+$imap_general_debug = false;
+
+ /******************************************************************************
+ ** Sets an unique session id in order to avoid simultanous sessions crash.
+ ******************************************************************************/
+
+ function sqimap_session_id() {
+ return( substr( session_id(), -4 ) );
+ }
+
/******************************************************************************
** Reads the output from the IMAP stream. If handle_errors is set to true,
** this will also handle all errors that are received. If it is not set,
** the errors will be sent back through $response and $message
******************************************************************************/
- function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
- global $color, $squirrelmail_language, $imap_general_debug;
- $read = fgets($imap_stream, 9096);
- if (preg_match ("/^\* [0-9]+ FETCH.*{([0-9]+)}/", $read, $regs)) {
- $size = $regs[1];
- }
+ function sqimap_read_data_list ($imap_stream, $pre, $handle_errors,
+ &$response, &$message) {
+ global $color, $squirrelmail_language;
+ global $imap_general_debug;
+
+ $read = '';
+ $resultlist = array();
- $continue = true;
- while ($continue) {
- // Continue if needed for this single line
+ $more_msgs = true;
+ while ($more_msgs) {
+ $data = array();
+ $total_size = 0;
while (strpos($read, "\n") === false) {
$read .= fgets($imap_stream, 9096);
}
- if ($imap_general_debug) {
- echo "$read
\n";
- flush();
+
+ 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
+
+ // For debugging purposes
+ if ($imap_general_debug) {
+ echo "$read
\n";
+ flush();
+ }
+
+ $size = 0;
+ $data[] = $read;
+ $read = fgets($imap_stream, 9096);
+ } else {
+ $size = 0;
}
-
- if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
- if ($size) {
- $dt = $data;
- $dt[0] = $dt[count($dt)-1] = "";
- $d = implode ("", $dt);
- if (strlen($d) >= $size) {
- $continue = false;
+ 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);
+ $read = fgets($imap_stream, 9096);
+ while (strpos($read, "\n") === false) {
+ $read .= fgets($imap_stream, 9096);
+ }
}
+ $total_size += strlen($read);
} else {
- $continue = false;
+ if (ereg("^$pre (OK|BAD|NO)(.*)", $read, $regs) ||
+ ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
+ break;
+ } else {
+ $data[] = $read;
+ $read = fgets ($imap_stream, 9096);
+ }
}
- } 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 ($imap_general_debug) { echo '--
'; }
+ 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.");
@@ -70,7 +127,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.");
@@ -79,10 +136,14 @@
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.
@@ -91,9 +152,9 @@
global $color, $squirrelmail_language, $HTTP_ACCEPT_LANGUAGE, $onetimepad;
$imap_stream = fsockopen ($imap_server_address, $imap_port,
- &$error_number, &$error_string, 15);
+ $error_number, $error_string, 15);
$server_info = fgets ($imap_stream, 1024);
-
+
// Decrypt the password
$password = OneTimePadDecrypt($password, $onetimepad);
@@ -107,28 +168,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 {
@@ -140,18 +201,18 @@
// $squirrelmail_language is set by a cookie when
// the user selects language and logs out
-
+
set_up_language($squirrelmail_language, true);
-
+
?>
-
+
- + |
+
|