X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=70d9b08dbcd13afdb1e650e31a5dc8e47e5258ba;hp=bcc94e38e899252a67548c64e7e4aacd674d9606;hb=0fbbda83507f220412b0c9f441511fc72489843e;hpb=fabd78f9fcfb1b0de884a7e3b6cd11bb33aadd0f
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index bcc94e38..70d9b08d 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -89,7 +89,7 @@
global $squirrelmail_language, $color;
/* Get the small headers for each message in $msg_list */
-
+ $sid = sqimap_session_id();
$maxmsg = sizeof($msg_list);
$msgs_str = sqimap_message_list_squisher($msg_list);
$results = array();
@@ -104,38 +104,37 @@
$id2index[$msg_list[$i]] = $i;
}
-
- $query = sqimap_session_id() . " FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";
+ $query = "$sid FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";
fputs ($imap_stream, $query);
- $readin_list = sqimap_read_data_list($imap_stream, sqimap_session_id(), true, $response, $message);
+ $readin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
foreach ($readin_list as $r) {
if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
set_up_language($squirrelmail_language);
- echo "
\n";
- echo _("ERROR : Could not complete request.");
- echo "
\n";
- echo _("Unknown response from IMAP server: ");
- echo $r[0] . "
\n";
- exit;
- }
- if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
+ echo '
' .
+ _("ERROR : Could not complete request.") .
+ '
' .
+ _("Unknown response from IMAP server: ") . ' 1.' .
+ $r[0] . "
\n";
+ // exit;
+ } else if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
set_up_language($squirrelmail_language);
- echo "
\n";
- echo _("ERROR : Could not complete request.");
- echo "
\n";
- echo _("Unknown message number in reply from server: ");
- echo $regs[1] . "
\n";
- exit;
+ echo '
' .
+ _("ERROR : Could not complete request.") .
+ '
' .
+ _("Unknown message number in reply from server: ") .
+ $regs[1] . "
\n";
+ // exit;
+ } else {
+ $read_list[$id2index[$regs[1]]] = $r;
}
- $read_list[$id2index[$regs[1]]] = $r;
}
arsort($read_list);
- $query = sqimap_session_id() . " FETCH $msgs_str RFC822.SIZE\r\n";
+ $query = "$sid FETCH $msgs_str RFC822.SIZE\r\n";
fputs ($imap_stream, $query);
- $sizesin_list = sqimap_read_data_list($imap_stream, sqimap_session_id(), true, $response, $message);
+ $sizesin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
foreach ($sizesin_list as $r) {
if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
@@ -143,7 +142,7 @@
echo "
\n";
echo _("ERROR : Could not complete request.");
echo "
\n";
- echo _("Unknown response from IMAP server: ");
+ echo _("Unknown response from IMAP server: ") . ' 2.';
echo $r[0] . "
\n";
exit;
}
@@ -202,8 +201,8 @@
}
if (trim($date) == "") {
- fputs($imap_stream, sqimap_session_id() . " FETCH $msg_list[$msgi] INTERNALDATE\r\n");
- $readdate = sqimap_read_data($imap_stream, sqimap_session_id(), true, $response, $message);
+ fputs($imap_stream, "$sid FETCH $msg_list[$msgi] INTERNALDATE\r\n");
+ $readdate = sqimap_read_data($imap_stream, $sid, true, $response, $message);
if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) {
$date_list = explode(" ", trim($regs[1]));
$date_list[0] = str_replace("-", " ", $date_list[0]);