diff options
| author | thomascube <thomas@roundcube.net> | 2007-11-06 18:24:25 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2007-11-06 18:24:25 +0000 |
| commit | e4867ea740cd0d03acb65fdc7a93f7764cc711b2 (patch) | |
| tree | bc7328f4a8573a212462affb134ae8f5072c8244 /program | |
| parent | ff0566bce5e960143a954e2c1356894a31e4f739 (diff) | |
Fix bugs #1484555, #1484646 and #1484639
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/session.inc | 1 | ||||
| -rw-r--r-- | program/lib/imap.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/search.inc | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/program/include/session.inc b/program/include/session.inc index a4952d1e7..8a98fadde 100644 --- a/program/include/session.inc +++ b/program/include/session.inc @@ -173,6 +173,7 @@ function sess_regenerate_id() session_id($random); $cookie = session_get_cookie_params(); + setcookie(session_name(), "", time() -3600); setcookie(session_name(), $random, $cookie['lifetime'], $cookie['path']); return true; diff --git a/program/lib/imap.inc b/program/lib/imap.inc index 05b1c00e1..264c3af50 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -1240,7 +1240,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false){ /* FETCH date,from,subject headers */ $key="fh".($c++); $prefix=$uidfetch?" UID":""; - $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE)])\r\n"; + $request=$key.$prefix." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCES)])\r\n"; if (!fputs($fp, $request)) return false; do{ @@ -1295,7 +1295,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false){ $result[$id]->encoding = str_replace("\n", " ", $headers["content-transfer-encoding"]); $result[$id]->ctype = str_replace("\n", " ", $headers["content-type"]); $result[$id]->in_reply_to = ereg_replace("[\n<>]",'', $headers['in-reply-to']); - $result[$id]->reference = $headers["reference"]; + $result[$id]->references = $headers["references"]; list($result[$id]->ctype, $ctype_add) = explode(";", $headers["content-type"]); diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index d13f71aa2..5131010af 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -86,9 +86,7 @@ if (!empty($msg_uid)) { $_SESSION['compose']['reply_uid'] = $msg_uid; $_SESSION['compose']['reply_msgid'] = $MESSAGE['headers']->messageID; - $_SESSION['compose']['references'] = $MESSAGE['headers']->reference; - $_SESSION['compose']['references'] .= !empty($MESSAGE['headers']->reference) ? ' ' : ''; - $_SESSION['compose']['references'] .= $MESSAGE['headers']->messageID; + $_SESSION['compose']['references'] = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID); if (!empty($_GET['_all'])) $MESSAGE['reply_all'] = 1; diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index a3f6dda66..5ed6627ef 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -64,7 +64,8 @@ else if (preg_match("/^body:/i", $str)) // search in subject and sender by default else { - $subject = array("HEADER SUBJECT", "HEADER FROM"); + $from = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM"; + $subject = array("HEADER SUBJECT", "HEADER $from"); $search = trim($str); } |