X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_general.php;h=c58f0907cffe6df997395aa357e2267fff3e568f;hp=691eb0112ac3058db36fd9d864b032b3feac2f9b;hb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;hpb=7e3de682282beed79b5240a7d3f1aa240b77c763
diff --git a/functions/imap_general.php b/functions/imap_general.php
index 691eb011..c58f0907 100755
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1,7 +1,7 @@
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);
- }
+ $data = array();
+ $read = sqimap_fgets($imap_stream);
+ while (1) {
+ switch (true) {
+ case preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read, $regs):
+ case preg_match('/^\* (BYE \[ALERT\])(.*)$/', $read, $regs):
+ $response = $regs[1];
+ $message = trim($regs[2]);
+ break 2;
+ case preg_match("/^\* (OK \[PARSE\])(.*)$/", $read):
+ $read = sqimap_fgets($imap_stream);
+ break 1;
+ case preg_match('/^\* ([0-9]+) FETCH.*/', $read, $regs):
+ $fetch_data = array();
+ $fetch_data[] = $read;
+ $read = sqimap_fgets($imap_stream);
+ while (!preg_match('/^\* [0-9]+ FETCH.*/', $read) &&
+ !preg_match("/^$pre (OK|BAD|NO)(.*)$/", $read)) {
+ $fetch_data[] = $read;
+ $last = $read;
+ $read = sqimap_fgets($imap_stream);
}
- $total_size += strlen($read);
- } else {
- 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);
+ if (isset($last) && preg_match('/^\)/', $last)) {
+ array_pop($fetch_data);
}
- }
- }
-
- while (($more_msgs = !ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) &&
- !ereg("^\\* [0-9]+ FETCH.*", $read, $regs)) {
- $read = fgets($imap_stream, 9096);
+ $resultlist[] = $fetch_data;
+ break 1;
+ default:
+ $data[] = $read;
+ $read = sqimap_fgets($imap_stream);
+ break 1;
}
+ }
+ if (!empty($data)) {
$resultlist[] = $data;
}
- $response = $regs[1];
- $message = trim($regs[2]);
-
- if ($handle_errors == false) { return $resultlist; }
-
- if ($response == 'NO') {
- // ignore this error from m$ exchange, it is not fatal (aka bug)
+ elseif (empty($resultlist)) {
+ $resultlist[] = array();
+ }
+ if ($handle_errors == false) {
+ return( $resultlist );
+ }
+ elseif ($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" .
- _("ERROR : Could not complete request.") .
- "
\n" .
- _("Reason Given: ") .
- $message . "
\n";
+ _("ERROR : Could not complete request.") .
+ "
\n" .
+ _("Query:") .
+ $query . '
' .
+ _("Reason Given: ") .
+ $message . "
\n";
exit;
}
- } else if ($response == 'BAD') {
+ }
+ elseif ($response == 'BAD') {
set_up_language($squirrelmail_language);
echo "
\n" .
- _("ERROR : Bad or malformed request.") .
- "
\n" .
- _("Server responded: ") .
- $message . "
\n";
+ _("ERROR : Bad or malformed request.") .
+ "
\n" .
+ _("Query:") .
+ $query . '
' .
+ _("Server responded: ") .
+ $message . "
\n";
exit;
+ }
+ else {
+ return $resultlist;
}
- return $resultlist;
}
-function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+function sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message, $query = '') {
+ $res = sqimap_read_data_list($imap_stream, $pre, $handle_errors, $response, $message, $query);
+
+ /* sqimap_read_data should be called for one response
+ but since it just calls sqimap_read_data_list which
+ handles multiple responses we need to check for that
+ and merge the $res array IF they are seperated and
+ IF it was a FETCH response. */
+
+ if (isset($res[1]) && is_array($res[1]) && isset($res[1][0])
+ && preg_match('/^\* \d+ FETCH/', $res[1][0])) {
+ $result = array();
+ foreach($res as $index=>$value) {
+ $result = array_merge($result, $res["$index"]);
+ }
+ }
+ if (isset($result)) {
+ return $result;
+ }
+ else {
+ return $res[0];
+ }
- $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.
-******************************************************************************/
+/*
+ * 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, $onetimepad;
+
+ $imap_server_address = sqimap_get_user_server($imap_server_address, $username);
- 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);
if ( !$imap_stream ) {
- return FALSE;
+ return false;
}
$server_info = fgets ($imap_stream, 1024);
-
- // Decrypt the password
+
+ /* Decrypt the password */
$password = OneTimePadDecrypt($password, $onetimepad);
-
- /** Do some error correction **/
+
+ /* Do some error correction */
if (!$imap_stream) {
if (!$hide) {
set_up_language($squirrelmail_language, true);
@@ -169,15 +200,14 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
exit;
}
- 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);
+ $query = 'LOGIN "' . quoteIMAP($username) . '" "' . quoteIMAP($password) . '"';
+ $read = sqimap_run_command ($imap_stream, $query, false, $response, $message);
- /** If the connection was not successful, lets see why **/
+ /* If the connection was not successful, lets see why */
if ($response != 'OK') {
if (!$hide) {
if ($response != 'NO') {
- // "BAD" and anything else gets reported here.
+ /* "BAD" and anything else gets reported here. */
set_up_language($squirrelmail_language, true);
if ($response == 'BAD') {
printf (_("Bad request: %s")."
\r\n", $message);
@@ -192,20 +222,20 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
}
exit;
} 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
+ /*
+ * 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);
-
- displayHtmlHeader( _("Unknown user or password incorrect.") );
- echo "