From c719f3c1e06c00fa4723f2f1298b3c94a1bec7e7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 20 Jun 2008 06:40:01 -0400
Subject: [PATCH] Store compose parameters in session and redirect to a unique URL
---
program/include/rcube_imap.php | 207 +++++++++++++++++++++++++--------------------------
1 files changed, 100 insertions(+), 107 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 04bb7bf..858a1e2 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -102,7 +102,7 @@
* @return boolean TRUE on success, FALSE on failure
* @access public
*/
- function connect($host, $user, $pass, $port=143, $use_ssl=null)
+ function connect($host, $user, $pass, $port=143, $use_ssl=null, $auth_type=null)
{
global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
@@ -118,8 +118,8 @@
$ICL_PORT = $port;
$IMAP_USE_INTERNAL_DATE = false;
-
- $this->conn = iil_Connect($host, $user, $pass, array('imap' => 'check'));
+
+ $this->conn = iil_Connect($host, $user, $pass, array('imap' => $auth_type ? $auth_type : 'check'));
$this->host = $host;
$this->user = $user;
$this->pass = $pass;
@@ -214,7 +214,7 @@
*/
function set_charset($cs)
{
- $this->default_charset = $ch;
+ $this->default_charset = $cs;
}
@@ -465,7 +465,7 @@
if (!$force && is_array($a_mailbox_cache[$mailbox]) && isset($a_mailbox_cache[$mailbox][$mode]))
return $a_mailbox_cache[$mailbox][$mode];
- // RECENT count is fetched abit different
+ // RECENT count is fetched a bit different
if ($mode == 'RECENT')
$count = iil_C_CheckForRecent($this->conn, $mailbox);
@@ -573,28 +573,24 @@
{
// retrieve headers from IMAP
if ($this->get_capability('sort') && ($msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
- {
- $msgs = $msg_index[$begin];
- for ($i=$begin+1; $i < $end; $i++)
- $msgs = $msgs.','.$msg_index[$i];
+ {
+ $mymsgidx = array_slice ($msg_index, $begin, $end-$begin);
+ $msgs = join(",", $mymsgidx);
}
else
{
$msgs = sprintf("%d:%d", $begin+1, $end);
-
- $i = 0;
- for ($msg_seqnum = $begin; $msg_seqnum <= $end; $msg_seqnum++)
- $msg_index[$i++] = $msg_seqnum;
+ $msg_index = range($begin, $end);
}
- // use this class for message sorting
- $sorter = new rcube_header_sorter();
- $sorter->set_sequence_numbers($msg_index);
// fetch reuested headers from server
$a_msg_headers = array();
$deleted_count = $this->_fetch_headers($mailbox, $msgs, $a_msg_headers, $cache_key);
-
+ if ($this->sort_order == 'DESC' && $headers_sorted) {
+ //since the sort order is not used in the iil_c_sort function we have to do it here
+ $a_msg_headers = array_reverse($a_msg_headers);
+ }
// delete cached messages with a higher index than $max+1
// Changed $max to $max+1 to fix this bug : #1484295
$this->clear_message_cache($cache_key, $max + 1);
@@ -605,15 +601,17 @@
}
-
// return empty array if no messages found
- if (!is_array($a_msg_headers) || empty($a_msg_headers))
- return array();
-
+ if (!is_array($a_msg_headers) || empty($a_msg_headers)) {
+ return array();
+ }
// if not already sorted
if (!$headers_sorted)
{
+ // use this class for message sorting
+ $sorter = new rcube_header_sorter();
+ $sorter->set_sequence_numbers($msg_index);
$sorter->sort_headers($a_msg_headers);
if ($this->sort_order == 'DESC')
@@ -652,21 +650,24 @@
*/
function _list_header_set($mailbox, $msgs, $page=NULL, $sort_field=NULL, $sort_order=NULL)
{
- // also accept a comma-separated list of message ids
- if (is_string($msgs))
- $msgs = split(',', $msgs);
-
if (!strlen($mailbox) || empty($msgs))
return array();
+ // also accept a comma-separated list of message ids
+ if (is_array ($msgs)) {
+ $max = count ($msgs);
+ $msgs = join (',', $msgs);
+ } else {
+ $max = count(split(',', $msgs));
+ }
+
$this->_set_sort_order($sort_field, $sort_order);
- $max = count($msgs);
$start_msg = ($this->list_page-1) * $this->page_size;
// fetch reuested headers from server
$a_msg_headers = array();
- $this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
+ $this->_fetch_headers($mailbox, $msgs, $a_msg_headers, NULL);
// return empty array if no messages found
if (!is_array($a_msg_headers) || empty($a_msg_headers))
@@ -1073,7 +1074,7 @@
$struct->ctype_primary = 'multipart';
// find first non-array entry
- for ($i=1; count($part); $i++)
+ for ($i=1; $i<count($part); $i++)
if (!is_array($part[$i]))
{
$struct->ctype_secondary = strtolower($part[$i]);
@@ -1084,7 +1085,7 @@
$struct->parts = array();
for ($i=0, $count=0; $i<count($part); $i++)
- if (is_array($part[$i]) && count($part[$i]) > 5)
+ if (is_array($part[$i]) && count($part[$i]) > 3)
$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id);
return $struct;
@@ -1158,10 +1159,13 @@
if (is_array($part[8]) && empty($struct->parts))
$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
}
-
+
// normalize filename property
if ($filename_mime = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name'])
- $struct->filename = rcube_imap::decode_mime_string($filename_mime, $this->default_charset);
+ {
+ $struct->filename = rcube_imap::decode_mime_string($filename_mime,
+ $struct->charset ? $struct->charset : rc_detect_encoding($filename_mime, $this->default_charset));
+ }
else if ($filename_encoded = $struct->d_parameters['filename*'] ? $struct->d_parameters['filename*'] : $struct->ctype_parameters['name*'])
{
// decode filename according to RFC 2231, Section 4
@@ -1169,42 +1173,13 @@
$struct->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
}
else if (!empty($struct->headers['content-description']))
- $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'], $this->default_charset);
+ $struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'],
+ $struct->charset ? $struct->charset : rc_detect_encoding($struct->headers['content-description'],$this->default_charset));
return $struct;
}
- /**
- * Return a flat array with references to all parts, indexed by part numbers
- *
- * @param object rcube_message_part Message body structure
- * @return Array with part number -> object pairs
- */
- function get_mime_numbers(&$structure)
- {
- $a_parts = array();
- $this->_get_part_numbers($structure, $a_parts);
- return $a_parts;
- }
-
-
- /**
- * Helper method for recursive calls
- *
- * @access private
- */
- function _get_part_numbers(&$part, &$a_parts)
- {
- if ($part->mime_id)
- $a_parts[$part->mime_id] = &$part;
-
- if (is_array($part->parts))
- for ($i=0; $i<count($part->parts); $i++)
- $this->_get_part_numbers($part->parts[$i], $a_parts);
- }
-
-
/**
* Fetch message body of a specific message from the server
*
@@ -1277,7 +1252,10 @@
*/
function &get_body($uid, $part=1)
{
- return $this->get_message_part($uid, $part);
+ $headers = $this->get_headers($uid);
+ return rcube_charset_convert(
+ $this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable'),
+ $headers->charset ? $headers->charset : $this->default_charset);
}
@@ -1409,16 +1387,16 @@
*/
function move_message($uids, $to_mbox, $from_mbox='')
{
- $to_mbox = stripslashes($to_mbox);
+ $to_mbox_in = stripslashes($to_mbox);
$from_mbox = stripslashes($from_mbox);
- $to_mbox = $this->_mod_mailbox($to_mbox);
+ $to_mbox = $this->_mod_mailbox($to_mbox_in);
$from_mbox = $from_mbox ? $this->_mod_mailbox($from_mbox) : $this->mailbox;
// make sure mailbox exists
if (!in_array($to_mbox, $this->_list_mailboxes()))
{
- if (in_array($to_mbox, $this->default_folders))
- $this->create_mailbox($to_mbox, TRUE);
+ if (in_array($to_mbox_in, $this->default_folders))
+ $this->create_mailbox($to_mbox_in, TRUE);
else
return FALSE;
}
@@ -1440,12 +1418,19 @@
// send expunge command in order to have the moved message
// really deleted from the source mailbox
- if ($moved)
- {
- $this->_expunge($from_mbox, FALSE);
- $this->_clear_messagecount($from_mbox);
- $this->_clear_messagecount($to_mbox);
- }
+ if ($moved) {
+ // but only when flag_for_deletion is set to false
+ if (!rcmail::get_instance()->config->get('flag_for_deletion', false))
+ {
+ $this->_expunge($from_mbox, FALSE);
+ $this->_clear_messagecount($from_mbox);
+ $this->_clear_messagecount($to_mbox);
+ }
+ }
+ // moving failed
+ else if (rcmail::get_instance()->config->get('delete_always', false)) {
+ return iil_C_Delete($this->conn, $from_mbox, join(',', $a_mids));
+ }
// remove message ids from search set
if ($moved && $this->search_set && $from_mbox == $this->mailbox)
@@ -1489,7 +1474,6 @@
if (!is_array($a_uids))
return false;
-
// convert uids to message ids
$a_mids = array();
foreach ($a_uids as $uid)
@@ -1503,10 +1487,11 @@
{
$this->_expunge($mailbox, FALSE);
$this->_clear_messagecount($mailbox);
+ unset($this->uid_id_map[$mailbox]);
}
// remove message ids from search set
- if ($moved && $this->search_set && $mailbox == $this->mailbox)
+ if ($deleted && $this->search_set && $mailbox == $this->mailbox)
$this->search_set = array_diff($this->search_set, $a_mids);
// remove deleted messages from cache
@@ -1901,6 +1886,9 @@
*/
function clear_cache($key=NULL)
{
+ if (!$this->caching_enabled)
+ return;
+
if ($key===NULL)
{
foreach ($this->cache as $key => $data)
@@ -2339,8 +2327,10 @@
$pos = strpos($input, '=?');
if ($pos !== false)
{
- // rfc: all line breaks or other characters not found in the Base64 Alphabet must be ignored by decoding software
- // delete all blanks between MIME-lines, differently we can receive unnecessary blanks and broken utf-8 symbols
+ // rfc: all line breaks or other characters not found
+ // in the Base64 Alphabet must be ignored by decoding software
+ // delete all blanks between MIME-lines, differently we can
+ // receive unnecessary blanks and broken utf-8 symbols
$input = preg_replace("/\?=\s+=\?/", '?==?', $input);
$out = substr($input, 0, $pos);
@@ -2357,9 +2347,10 @@
return $out;
}
-
+
// no encoding information, use fallback
- return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
+ return rcube_charset_convert($input,
+ !empty($fallback) ? $fallback : rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'));
}
@@ -2509,10 +2500,12 @@
*/
function _sort_mailbox_list($a_folders)
{
- $a_out = $a_defaults = array();
+ $a_out = $a_defaults = $folders = array();
+
+ $delimiter = $this->get_hierarchy_delimiter();
// find default folders and skip folders starting with '.'
- foreach($a_folders as $i => $folder)
+ foreach ($a_folders as $i => $folder)
{
if ($folder{0}=='.')
continue;
@@ -2520,13 +2513,31 @@
if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
$a_defaults[$p] = $folder;
else
- $a_out[] = $folder;
+ $folders[$folder] = rc_strtolower(rcube_charset_convert($folder, 'UTF-7'));
}
- natcasesort($a_out);
+ asort($folders, SORT_LOCALE_STRING);
ksort($a_defaults);
-
- return array_merge($a_defaults, $a_out);
+
+ $folders = array_merge($a_defaults, array_keys($folders));
+
+ // finally we must rebuild the list to move
+ // subfolders of default folders to their place
+ while (list($key, $folder) = each($folders)) {
+ $a_out[] = $folder;
+ unset($folders[$key]);
+ if (in_array(strtolower($folder), $this->default_folders_lc)) {
+ foreach ($folders as $idx => $f) {
+ if (strpos($f, $folder.$delimiter) === 0) {
+ $a_out[] = $f;
+ unset($folders[$idx]);
+ }
+ }
+ reset($folders);
+ }
+ }
+
+ return $a_out;
}
/**
@@ -2806,7 +2817,7 @@
*/
function set_sequence_numbers($seqnums)
{
- $this->sequence_numbers = $seqnums;
+ $this->sequence_numbers = array_flip($seqnums);
}
/**
@@ -2827,23 +2838,6 @@
}
/**
- * Get the position of a message sequence number in my sequence_numbers array
- *
- * @param int Message sequence number contained in sequence_numbers
- * @return int Position, -1 if not found
- */
- function position_of($seqnum)
- {
- $c = count($this->sequence_numbers);
- for ($pos = 0; $pos <= $c; $pos++)
- {
- if ($this->sequence_numbers[$pos] == $seqnum)
- return $pos;
- }
- return -1;
- }
-
- /**
* Sort method called by uasort()
*/
function compare_seqnums($a, $b)
@@ -2853,12 +2847,11 @@
$seqb = $b->id;
// then find each sequence number in my ordered list
- $posa = $this->position_of($seqa);
- $posb = $this->position_of($seqb);
+ $posa = isset($this->sequence_numbers[$seqa]) ? intval($this->sequence_numbers[$seqa]) : -1;
+ $posb = isset($this->sequence_numbers[$seqb]) ? intval($this->sequence_numbers[$seqb]) : -1;
// return the relative position as the comparison value
- $ret = $posa - $posb;
- return $ret;
+ return $posa - $posb;
}
}
--
Gitblit v1.9.1