banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:roundcube/roundcubemail

Browse Source
pull/52/head
Thomas Bruederli 12 years ago
parent dc67f38cdf 87ec1de655
commit f7136bd217
15 changed files with 224 additions and 184 deletions
Show Stats Download Patch File Download Diff File

5
CHANGELOG
Unescape Escape View File

@ -1,13 +1,16 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix handling of signatures on draft edit (#1488798)
- Fix so compacting of non-empty folder is possible also when messages list is empty (#1488858)
- Allow forwarding of multiple emails (#1486854)
- Fix big memory consumption of DB layer (#1488856) - Fix big memory consumption of DB layer (#1488856)
- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844) - Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844)
- Fix XSS vulnerability in vbscript: and data:text links handling (#1488850) - Fix XSS vulnerability in vbscript: and data:text links handling (#1488850)
- Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836) - Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836)
- Fix empty email on identities list after identity update (#1488834) - Fix empty email on identities list after identity update (#1488834)
- Add new identities_level: (4) one identity with possibility to edit only signature - Add new identities_level: (4) one identity with possibility to edit only signature
- Use Delivered-To header as a last resort for identity selection (#1488840) - Use Delivered-To and Envelope-To headers for identity selection (#1488840, #1488553)
- Fix XSS vulnerability using Flash files (#1488828) - Fix XSS vulnerability using Flash files (#1488828)
- Fix absolute positioning in HTML messages (#1488819) - Fix absolute positioning in HTML messages (#1488819)
- Fix cache (in)validation after setting \Deleted flag - Fix cache (in)validation after setting \Deleted flag

5
program/include/rcmail_output_html.php
Unescape Escape View File

@ -670,7 +670,10 @@ class rcmail_output_html extends rcmail_output
*/ */
public function just_parse($input) public function just_parse($input)
{ {
return $this->parse_xml($input); $input = $this->parse_conditions($input);
$input = $this->parse_xml($input);
return $input;
} }

177
program/js/app.js
Unescape Escape View File

@ -224,9 +224,10 @@ function rcube_webmail()
this.set_button_titles(); this.set_button_titles();
this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward', this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download', 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment']; 'print', 'load-attachment', 'show-headers', 'hide-headers', 'download',
'forward', 'forward-inline', 'forward-attachment'];
if (this.env.action == 'show' || this.env.action == 'preview') { if (this.env.action == 'show' || this.env.action == 'preview') {
this.enable_command(this.env.message_commands, this.env.uid); this.enable_command(this.env.message_commands, this.env.uid);
@ -650,13 +651,13 @@ function rcube_webmail()
break; break;
case 'expunge': case 'expunge':
if (this.env.messagecount) if (this.env.exists)
this.expunge_mailbox(this.env.mailbox); this.expunge_mailbox(this.env.mailbox);
break; break;
case 'purge': case 'purge':
case 'empty-mailbox': case 'empty-mailbox':
if (this.env.messagecount) if (this.env.exists)
this.purge_mailbox(this.env.mailbox); this.purge_mailbox(this.env.mailbox);
break; break;
@ -999,10 +1000,12 @@ function rcube_webmail()
break; break;
case 'forward-attachment': case 'forward-attachment':
case 'forward-inline':
case 'forward': case 'forward':
if (uid = this.get_single_uid()) { var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
url = { _forward_uid: uid, _mbox: this.env.mailbox }; if (uids.length) {
if (command == 'forward-attachment' || (!props && this.env.forward_attachment)) url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox };
if (command == 'forward-attachment' || (!props && this.env.forward_attachment) || uids.length > 1)
url._attachment = 1; url._attachment = 1;
this.open_compose_step(url); this.open_compose_step(url);
} }
@ -1526,7 +1529,7 @@ function rcube_webmail()
if (selected) { if (selected) {
// Hide certain command buttons when Drafts folder is selected // Hide certain command buttons when Drafts folder is selected
if (this.env.mailbox == this.env.drafts_mailbox) if (this.env.mailbox == this.env.drafts_mailbox)
this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', false); this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', 'forward-inline', false);
// Disable reply-list when List-Post header is not set // Disable reply-list when List-Post header is not set
else { else {
var msg = this.env.messages[list.get_single_selection()]; var msg = this.env.messages[list.get_single_selection()];
@ -1535,7 +1538,7 @@ function rcube_webmail()
} }
} }
// Multi-message commands // Multi-message commands
this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false)); this.enable_command('delete', 'moveto', 'copy', 'mark', 'forward', 'forward-attachment', list.selection.length > 0);
// reset all-pages-selection // reset all-pages-selection
if (selected || (list.selection.length && list.selection.length != list.rowcount)) if (selected || (list.selection.length && list.selection.length != list.rowcount))
@ -2550,27 +2553,18 @@ function rcube_webmail()
if (mbox && typeof mbox === 'object') if (mbox && typeof mbox === 'object')
mbox = mbox.id; mbox = mbox.id;
// exit if current or no mailbox specified or if selection is empty // exit if current or no mailbox specified
if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))) if (!mbox || mbox == this.env.mailbox)
return; return;
var a_uids = [], n, selection, var post_data = this.selection_post_data({_target_mbox: mbox});
lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
post_data = {_mbox: this.env.mailbox, _target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
if (this.env.uid)
a_uids[0] = this.env.uid;
else {
selection = this.message_list.get_selection();
for (n in selection) {
a_uids.push(selection[n]);
}
}
post_data._uid = this.uids_to_list(a_uids); // exit if selection is empty
if (!post_data._uid)
return;
// send request to server // send request to server
this.http_post('copy', post_data, lock); this.http_post('copy', post_data, this.display_message(this.get_label('copyingmessage'), 'loading'));
}; };
// move selected messages to the specified mailbox // move selected messages to the specified mailbox
@ -2579,12 +2573,15 @@ function rcube_webmail()
if (mbox && typeof mbox === 'object') if (mbox && typeof mbox === 'object')
mbox = mbox.id; mbox = mbox.id;
// exit if current or no mailbox specified or if selection is empty // exit if current or no mailbox specified
if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))) if (!mbox || mbox == this.env.mailbox)
return; return;
var lock = false, var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});
add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
// exit if selection is empty
if (!post_data._uid)
return;
// show wait message // show wait message
if (this.env.action == 'show') if (this.env.action == 'show')
@ -2595,7 +2592,7 @@ function rcube_webmail()
// Hide message command buttons until a message is selected // Hide message command buttons until a message is selected
this.enable_command(this.env.message_commands, false); this.enable_command(this.env.message_commands, false);
this._with_selected_messages('moveto', lock, add_post); this._with_selected_messages('moveto', post_data, lock);
}; };
// delete selected messages from the current mailbox // delete selected messages from the current mailbox
@ -2603,7 +2600,7 @@ function rcube_webmail()
{ {
var uid, i, len, trash = this.env.trash_mailbox, var uid, i, len, trash = this.env.trash_mailbox,
list = this.message_list, list = this.message_list,
selection = list ? $.merge([], list.get_selection()) : []; selection = list.get_selection();
// exit if no mailbox specified or if selection is empty // exit if no mailbox specified or if selection is empty
if (!this.env.uid && !selection.length) if (!this.env.uid && !selection.length)
@ -2622,7 +2619,6 @@ function rcube_webmail()
return false; return false;
} }
// if there isn't a defined trash mailbox or we are in it // if there isn't a defined trash mailbox or we are in it
// @TODO: we should check if defined trash mailbox exists
else if (!trash || this.env.mailbox == trash) else if (!trash || this.env.mailbox == trash)
this.permanently_remove_messages(); this.permanently_remove_messages();
// we're in Junk folder and delete_junk is enabled // we're in Junk folder and delete_junk is enabled
@ -2645,32 +2641,29 @@ function rcube_webmail()
// delete the selected messages permanently // delete the selected messages permanently
this.permanently_remove_messages = function() this.permanently_remove_messages = function()
{ {
// exit if no mailbox specified or if selection is empty var post_data = this.selection_post_data();
if (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))
// exit if selection is empty
if (!post_data._uid)
return; return;
this.show_contentframe(false); this.show_contentframe(false);
this._with_selected_messages('delete', false, {_from: this.env.action ? this.env.action : ''}); this._with_selected_messages('delete', post_data);
}; };
// Send a specifc moveto/delete request with UIDs of all selected messages // Send a specifc moveto/delete request with UIDs of all selected messages
// @private // @private
this._with_selected_messages = function(action, lock, post_data) this._with_selected_messages = function(action, post_data, lock)
{ {
var a_uids = [], count = 0, msg, lock; var count = 0, msg;
if (typeof(post_data) != 'object') // update the list (remove rows, clear selection)
post_data = {}; if (this.message_list) {
if (this.env.uid)
a_uids[0] = this.env.uid;
else {
var n, id, root, roots = [], var n, id, root, roots = [],
selection = this.message_list.get_selection(); selection = this.message_list.get_selection();
for (n=0, len=selection.length; n<len; n++) { for (n=0, len=selection.length; n<len; n++) {
id = selection[n]; id = selection[n];
a_uids.push(id);
if (this.env.threading) { if (this.env.threading) {
count += this.update_thread(id); count += this.update_thread(id);
@ -2690,10 +2683,6 @@ function rcube_webmail()
} }
} }
// also send search request to get the right messages
if (this.env.search_request)
post_data._search = this.env.search_request;
if (this.env.display_next && this.env.next_uid) if (this.env.display_next && this.env.next_uid)
post_data._next_uid = this.env.next_uid; post_data._next_uid = this.env.next_uid;
@ -2703,9 +2692,6 @@ function rcube_webmail()
else if (count > 0) else if (count > 0)
this.delete_excessive_thread_rows(); this.delete_excessive_thread_rows();
post_data._uid = this.uids_to_list(a_uids);
post_data._mbox = this.env.mailbox;
if (!lock) { if (!lock) {
msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage'; msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
lock = this.display_message(this.get_label(msg), 'loading'); lock = this.display_message(this.get_label(msg), 'loading');
@ -2715,22 +2701,41 @@ function rcube_webmail()
this.http_post(action, post_data, lock); this.http_post(action, post_data, lock);
}; };
// build post data for message delete/move/copy/flag requests
this.selection_post_data = function(data)
{
if (typeof(data) != 'object')
data = {};
data._mbox = this.env.mailbox;
if (!data._uid) {
var uids = this.env.uid ? this.env.uid : this.message_list.get_selection();
data._uid = this.uids_to_list(uids);
}
if (this.env.action)
data._from = this.env.action;
// also send search request to get the right messages
if (this.env.search_request)
data._search = this.env.search_request;
return data;
};
// set a specific flag to one or more messages // set a specific flag to one or more messages
this.mark_message = function(flag, uid) this.mark_message = function(flag, uid)
{ {
var a_uids = [], r_uids = [], len, n, id, selection, var a_uids = [], r_uids = [], len, n, id,
list = this.message_list; list = this.message_list;
if (uid) if (uid)
a_uids[0] = uid; a_uids[0] = uid;
else if (this.env.uid) else if (this.env.uid)
a_uids[0] = this.env.uid; a_uids[0] = this.env.uid;
else if (list) { else if (list)
selection = list.get_selection(); a_uids = list.get_selection();
for (n=0, len=selection.length; n<len; n++) {
a_uids.push(selection[n]);
}
}
if (!list) if (!list)
r_uids = a_uids; r_uids = a_uids;
@ -2738,12 +2743,12 @@ function rcube_webmail()
list.focus(); list.focus();
for (n=0, len=a_uids.length; n<len; n++) { for (n=0, len=a_uids.length; n<len; n++) {
id = a_uids[n]; id = a_uids[n];
if ((flag=='read' && list.rows[id].unread) if ((flag == 'read' && list.rows[id].unread)
|| (flag=='unread' && !list.rows[id].unread) || (flag == 'unread' && !list.rows[id].unread)
|| (flag=='delete' && !list.rows[id].deleted) || (flag == 'delete' && !list.rows[id].deleted)
|| (flag=='undelete' && list.rows[id].deleted) || (flag == 'undelete' && list.rows[id].deleted)
|| (flag=='flagged' && !list.rows[id].flagged) || (flag == 'flagged' && !list.rows[id].flagged)
|| (flag=='unflagged' && list.rows[id].flagged)) || (flag == 'unflagged' && list.rows[id].flagged))
{ {
r_uids.push(id); r_uids.push(id);
} }
@ -2774,16 +2779,12 @@ function rcube_webmail()
this.toggle_read_status = function(flag, a_uids) this.toggle_read_status = function(flag, a_uids)
{ {
var i, len = a_uids.length, var i, len = a_uids.length,
post_data = {_uid: this.uids_to_list(a_uids), _flag: flag}, post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
lock = this.display_message(this.get_label('markingmessage'), 'loading'); lock = this.display_message(this.get_label('markingmessage'), 'loading');
// mark all message rows as read/unread // mark all message rows as read/unread
for (i=0; i<len; i++) for (i=0; i<len; i++)
this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false)); this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));
// also send search request to get the right messages
if (this.env.search_request)
post_data._search = this.env.search_request;
this.http_post('mark', post_data, lock); this.http_post('mark', post_data, lock);
@ -2795,16 +2796,12 @@ function rcube_webmail()
this.toggle_flagged_status = function(flag, a_uids) this.toggle_flagged_status = function(flag, a_uids)
{ {
var i, len = a_uids.length, var i, len = a_uids.length,
post_data = {_uid: this.uids_to_list(a_uids), _flag: flag}, post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
lock = this.display_message(this.get_label('markingmessage'), 'loading'); lock = this.display_message(this.get_label('markingmessage'), 'loading');
// mark all message rows as flagged/unflagged // mark all message rows as flagged/unflagged
for (i=0; i<len; i++) for (i=0; i<len; i++)
this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false)); this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));
// also send search request to get the right messages
if (this.env.search_request)
post_data._search = this.env.search_request;
this.http_post('mark', post_data, lock); this.http_post('mark', post_data, lock);
}; };
@ -2843,25 +2840,20 @@ function rcube_webmail()
this.flag_as_undeleted = function(a_uids) this.flag_as_undeleted = function(a_uids)
{ {
var i, len=a_uids.length, var i, len = a_uids.length,
post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'}, post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'undelete'}),
lock = this.display_message(this.get_label('markingmessage'), 'loading'); lock = this.display_message(this.get_label('markingmessage'), 'loading');
for (i=0; i<len; i++) for (i=0; i<len; i++)
this.set_message(a_uids[i], 'deleted', false); this.set_message(a_uids[i], 'deleted', false);
// also send search request to get the right messages
if (this.env.search_request)
post_data._search = this.env.search_request;
this.http_post('mark', post_data, lock); this.http_post('mark', post_data, lock);
return true;
}; };
this.flag_as_deleted = function(a_uids) this.flag_as_deleted = function(a_uids)
{ {
var r_uids = [], var r_uids = [],
post_data = {_uid: this.uids_to_list(a_uids), _flag: 'delete'}, post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
lock = this.display_message(this.get_label('markingmessage'), 'loading'), lock = this.display_message(this.get_label('markingmessage'), 'loading'),
rows = this.message_list ? this.message_list.rows : [], rows = this.message_list ? this.message_list.rows : [],
count = 0; count = 0;
@ -2892,9 +2884,6 @@ function rcube_webmail()
this.delete_excessive_thread_rows(); this.delete_excessive_thread_rows();
} }
if (this.env.action)
post_data._from = this.env.action;
// ?? // ??
if (r_uids.length) if (r_uids.length)
post_data._ruid = this.uids_to_list(r_uids); post_data._ruid = this.uids_to_list(r_uids);
@ -2902,12 +2891,7 @@ function rcube_webmail()
if (this.env.skip_deleted && this.env.display_next && this.env.next_uid) if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
post_data._next_uid = this.env.next_uid; post_data._next_uid = this.env.next_uid;
// also send search request to get the right messages
if (this.env.search_request)
post_data._search = this.env.search_request;
this.http_post('mark', post_data, lock); this.http_post('mark', post_data, lock);
return true;
}; };
// flag as read without mark request (called from backend) // flag as read without mark request (called from backend)
@ -2987,7 +2971,7 @@ function rcube_webmail()
// test if purge command is allowed // test if purge command is allowed
this.purge_mailbox_test = function() this.purge_mailbox_test = function()
{ {
return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox return (this.env.exists && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
|| this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
|| this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter)))); || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
}; };
@ -6244,7 +6228,7 @@ function rcube_webmail()
case 'purge': case 'purge':
case 'expunge': case 'expunge':
if (this.task == 'mail') { if (this.task == 'mail') {
if (!this.env.messagecount) { if (!this.env.exists) {
// clear preview pane content // clear preview pane content
if (this.env.contentframe) if (this.env.contentframe)
this.show_contentframe(false); this.show_contentframe(false);
@ -6264,7 +6248,8 @@ function rcube_webmail()
this.env.qsearch = null; this.env.qsearch = null;
case 'list': case 'list':
if (this.task == 'mail') { if (this.task == 'mail') {
this.enable_command('show', 'expunge', 'select-all', 'select-none', (this.env.messagecount > 0)); this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
this.enable_command('expunge', this.env.exists);
this.enable_command('purge', this.purge_mailbox_test()); this.enable_command('purge', this.purge_mailbox_test());
this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount); this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);

16
program/lib/Roundcube/rcube_imap.php
Unescape Escape View File

@ -151,7 +151,7 @@ class rcube_imap extends rcube_storage
$attempt = 0; $attempt = 0;
do { do {
$data = rcube::get_instance()->plugins->exec_hook('imap_connect', $data = rcube::get_instance()->plugins->exec_hook('storage_connect',
array_merge($this->options, array('host' => $host, 'user' => $user, array_merge($this->options, array('host' => $host, 'user' => $user,
'attempt' => ++$attempt))); 'attempt' => ++$attempt)));
@ -571,7 +571,7 @@ class rcube_imap extends rcube_storage
* Get message count for a specific folder * Get message count for a specific folder
* *
* @param string $folder Folder name * @param string $folder Folder name
* @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT] * @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
* @param boolean $force Force reading from server and update cache * @param boolean $force Force reading from server and update cache
* @param boolean $status Enables storing folder status info (max UID/count), * @param boolean $status Enables storing folder status info (max UID/count),
* required for folder_status() * required for folder_status()
@ -592,7 +592,7 @@ class rcube_imap extends rcube_storage
* protected method for getting nr of messages * protected method for getting nr of messages
* *
* @param string $folder Folder name * @param string $folder Folder name
* @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT] * @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
* @param boolean $force Force reading from server and update cache * @param boolean $force Force reading from server and update cache
* @param boolean $status Enables storing folder status info (max UID/count), * @param boolean $status Enables storing folder status info (max UID/count),
* required for folder_status() * required for folder_status()
@ -614,6 +614,10 @@ class rcube_imap extends rcube_storage
} }
} }
// EXISTS is a special alias for ALL, it allows to get the number
// of all messages in a folder also when search is active and with
// any skip_deleted setting
$a_folder_cache = $this->get_cache('messagecount'); $a_folder_cache = $this->get_cache('messagecount');
// return cached value // return cached value
@ -644,7 +648,7 @@ class rcube_imap extends rcube_storage
$count = $this->conn->countRecent($folder); $count = $this->conn->countRecent($folder);
} }
// use SEARCH for message counting // use SEARCH for message counting
else if (!empty($this->options['skip_deleted'])) { else if ($mode != 'EXISTS' && !empty($this->options['skip_deleted'])) {
$search_str = "ALL UNDELETED"; $search_str = "ALL UNDELETED";
$keys = array('COUNT'); $keys = array('COUNT');
@ -683,8 +687,8 @@ class rcube_imap extends rcube_storage
} }
else { else {
$count = $this->conn->countMessages($folder); $count = $this->conn->countMessages($folder);
if ($status) { if ($status && $mode == 'ALL') {
$this->set_folder_stats($folder,'cnt', $count); $this->set_folder_stats($folder, 'cnt', $count);
$this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0); $this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0);
} }
} }

3
program/lib/Roundcube/rcube_plugin_api.php
Unescape Escape View File

@ -78,7 +78,8 @@ class rcube_plugin_api
'identity_save' => 'identity_update', 'identity_save' => 'identity_update',
// to be removed after 0.8 // to be removed after 0.8
'imap_init' => 'storage_init', 'imap_init' => 'storage_init',
'mailboxes_list' => 'storage_folders', 'mailboxes_list' => 'storage_folders',
'imap_connect' => 'storage_connect',
); );
/** /**

3
program/lib/Roundcube/rcube_storage.php
Unescape Escape View File

@ -65,6 +65,7 @@ abstract class rcube_storage
'MAIL-REPLY-TO', 'MAIL-REPLY-TO',
'RETURN-PATH', 'RETURN-PATH',
'DELIVERED-TO', 'DELIVERED-TO',
'ENVELOPE-TO',
); );
const UNKNOWN = 0; const UNKNOWN = 0;
@ -353,7 +354,7 @@ abstract class rcube_storage
* Get messages count for a specific folder. * Get messages count for a specific folder.
* *
* @param string $folder Folder name * @param string $folder Folder name
* @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT] * @param string $mode Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
* @param boolean $force Force reading from server and update cache * @param boolean $force Force reading from server and update cache
* @param boolean $status Enables storing folder status info (max UID/count), * @param boolean $status Enables storing folder status info (max UID/count),
* required for folder_status() * required for folder_status()

4
program/steps/mail/check_recent.inc
Unescape Escape View File

@ -75,13 +75,15 @@ foreach ($a_mailboxes as $mbox_name) {
if (!empty($_GET['_quota'])) if (!empty($_GET['_quota']))
$OUTPUT->command('set_quota', rcmail_quota_content()); $OUTPUT->command('set_quota', rcmail_quota_content());
$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
// "No-list" mode, don't get messages // "No-list" mode, don't get messages
if (empty($_GET['_list'])) if (empty($_GET['_list']))
continue; continue;
// get overall message count; allow caching because rcube_storage::folder_status() did a refresh // get overall message count; allow caching because rcube_storage::folder_status() did a refresh
$list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL'; $list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL';
$all_count = $RCMAIL->storage->count(null, $list_mode, false, false); $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, false, false);
$page = $RCMAIL->storage->get_page(); $page = $RCMAIL->storage->get_page();
$page_size = $RCMAIL->storage->get_pagesize(); $page_size = $RCMAIL->storage->get_pagesize();

178
program/steps/mail/compose.inc
Unescape Escape View File

@ -151,30 +151,38 @@ if ($font && !is_array($font)) {
// get reference message and set compose mode // get reference message and set compose mode
if ($msg_uid = $COMPOSE['param']['draft_uid']) { if ($msg_uid = $COMPOSE['param']['draft_uid']) {
$RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
$compose_mode = RCUBE_COMPOSE_DRAFT; $compose_mode = RCUBE_COMPOSE_DRAFT;
$RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
} }
else if ($msg_uid = $COMPOSE['param']['reply_uid']) else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
$compose_mode = RCUBE_COMPOSE_REPLY; $compose_mode = RCUBE_COMPOSE_REPLY;
else if ($msg_uid = $COMPOSE['param']['forward_uid']) $OUTPUT->set_env('compose_mode', 'reply');
}
else if ($msg_uid = $COMPOSE['param']['forward_uid']) {
$compose_mode = RCUBE_COMPOSE_FORWARD; $compose_mode = RCUBE_COMPOSE_FORWARD;
else if ($msg_uid = $COMPOSE['param']['uid']) $OUTPUT->set_env('compose_mode', 'forward');
$COMPOSE['forward_uid'] = $msg_uid;
$COMPOSE['as_attachment'] = !empty($COMPOSE['param']['attachment']);
}
else if ($msg_uid = $COMPOSE['param']['uid']) {
$compose_mode = RCUBE_COMPOSE_EDIT; $compose_mode = RCUBE_COMPOSE_EDIT;
}
$config_show_sig = $RCMAIL->config->get('show_sig', 1); $config_show_sig = $RCMAIL->config->get('show_sig', 1);
if ($config_show_sig == 1) if ($compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT) {
// don't add signature in draft/edit mode, we'll also not remove the old-one
}
else if ($config_show_sig == 1)
$OUTPUT->set_env('show_sig', true); $OUTPUT->set_env('show_sig', true);
else if ($config_show_sig == 2 && (empty($compose_mode) || $compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT)) else if ($config_show_sig == 2 && empty($compose_mode))
$OUTPUT->set_env('show_sig', true); $OUTPUT->set_env('show_sig', true);
else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD)) else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD))
$OUTPUT->set_env('show_sig', true); $OUTPUT->set_env('show_sig', true);
else
$OUTPUT->set_env('show_sig', false);
// set line length for body wrapping // set line length for body wrapping
$LINE_LENGTH = $RCMAIL->config->get('line_length', 72); $LINE_LENGTH = $RCMAIL->config->get('line_length', 72);
if (!empty($msg_uid)) if (!empty($msg_uid) && empty($COMPOSE['as_attachment']))
{ {
// similar as in program/steps/mail/show.inc // similar as in program/steps/mail/show.inc
// re-set 'prefer_html' to have possibility to use html part for compose // re-set 'prefer_html' to have possibility to use html part for compose
@ -188,8 +196,7 @@ if (!empty($msg_uid))
if (!empty($MESSAGE->headers->charset)) if (!empty($MESSAGE->headers->charset))
$RCMAIL->storage->set_charset($MESSAGE->headers->charset); $RCMAIL->storage->set_charset($MESSAGE->headers->charset);
if ($compose_mode == RCUBE_COMPOSE_REPLY) if ($compose_mode == RCUBE_COMPOSE_REPLY) {
{
$COMPOSE['reply_uid'] = $msg_uid; $COMPOSE['reply_uid'] = $msg_uid;
$COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID; $COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
$COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID); $COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);
@ -197,8 +204,6 @@ if (!empty($msg_uid))
if (!empty($COMPOSE['param']['all'])) if (!empty($COMPOSE['param']['all']))
$MESSAGE->reply_all = $COMPOSE['param']['all']; $MESSAGE->reply_all = $COMPOSE['param']['all'];
$OUTPUT->set_env('compose_mode', 'reply');
// Save the sent message in the same folder of the message being replied to // Save the sent message in the same folder of the message being replied to
if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox']) if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
&& rcmail_check_sent_folder($sent_folder, false) && rcmail_check_sent_folder($sent_folder, false)
@ -206,10 +211,8 @@ if (!empty($msg_uid))
$COMPOSE['param']['sent_mbox'] = $sent_folder; $COMPOSE['param']['sent_mbox'] = $sent_folder;
} }
} }
else if ($compose_mode == RCUBE_COMPOSE_DRAFT) else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
{ if ($MESSAGE->headers->others['x-draft-info']) {
if ($MESSAGE->headers->others['x-draft-info'])
{
// get reply_uid/forward_uid to flag the original message when sending // get reply_uid/forward_uid to flag the original message when sending
$info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']); $info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);
@ -233,14 +236,6 @@ if (!empty($msg_uid))
$COMPOSE['references'] = $MESSAGE->headers->references; $COMPOSE['references'] = $MESSAGE->headers->references;
} }
else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
{
$COMPOSE['forward_uid'] = $msg_uid;
$OUTPUT->set_env('compose_mode', 'forward');
if (!empty($COMPOSE['param']['attachment']))
$MESSAGE->forward_attachment = true;
}
} }
else { else {
$MESSAGE = new stdClass(); $MESSAGE = new stdClass();
@ -461,6 +456,16 @@ function rcmail_identity_select($MESSAGE, $identities, $compose_mode)
} }
} }
// Fallback using Envelope-To
if ($from_idx === null && ($envelope_to = $MESSAGE->headers->others['envelope-to'])) {
foreach ($identities as $idx => $ident) {
if (in_array($ident['email_ascii'], (array)$envelope_to)) {
$from_idx = $idx;
break;
}
}
}
return $identities[$from_idx !== null ? $from_idx : $default_identity]; return $identities[$from_idx !== null ? $from_idx : $default_identity];
} }
@ -643,11 +648,11 @@ function rcmail_prepare_message_body()
$isHtml = false; $isHtml = false;
} }
// forward as attachment // forward as attachment
else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) { else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
$isHtml = rcmail_compose_editor_mode(); $isHtml = rcmail_compose_editor_mode();
$body = ''; $body = '';
if (empty($COMPOSE['attachments'])) if (empty($COMPOSE['attachments']))
rcmail_write_forward_attachment($MESSAGE); rcmail_write_forward_attachments();
} }
// reply/edit/draft/forward // reply/edit/draft/forward
else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $RCMAIL->config->get('reply_mode') != -1)) { else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $RCMAIL->config->get('reply_mode') != -1)) {
@ -737,8 +742,10 @@ function rcmail_compose_part_body($part, $isHtml = false)
} }
else { else {
// try to remove the signature // try to remove the signature
if ($RCMAIL->config->get('strip_existing_sig', true)) { if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
$body = rcmail_remove_signature($body); if ($RCMAIL->config->get('strip_existing_sig', true)) {
$body = rcmail_remove_signature($body);
}
} }
// add HTML formatting // add HTML formatting
$body = rcmail_plain_body($body); $body = rcmail_plain_body($body);
@ -769,8 +776,10 @@ function rcmail_compose_part_body($part, $isHtml = false)
} }
// try to remove the signature // try to remove the signature
if ($RCMAIL->config->get('strip_existing_sig', true)) { if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
$body = rcmail_remove_signature($body); if ($RCMAIL->config->get('strip_existing_sig', true)) {
$body = rcmail_remove_signature($body);
}
} }
} }
} }
@ -1135,55 +1144,86 @@ function rcmail_write_inline_attachments(&$message)
return $cid_map; return $cid_map;
} }
// Creates an attachment from the forwarded message // Creates attachment(s) from the forwarded message(s)
function rcmail_write_forward_attachment(&$message) function rcmail_write_forward_attachments()
{ {
global $RCMAIL, $COMPOSE; global $RCMAIL, $COMPOSE, $MESSAGE;
$storage = $RCMAIL->get_storage();
$mem_limit = parse_bytes(ini_get('memory_limit'));
$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
$names = array();
if (strlen($message->subject)) { if ($COMPOSE['forward_uid'] == '*') {
$name = mb_substr($message->subject, 0, 64) . '.eml'; $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
$COMPOSE['forward_uid'] = $index->get();
} }
else { else {
$name = 'message_rfc822.eml'; $COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
} }
$mem_limit = parse_bytes(ini_get('memory_limit')); foreach ((array)$COMPOSE['forward_uid'] as $uid) {
$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB $message = new rcube_message($uid);
$data = $path = null;
// don't load too big attachments into memory if (empty($message->headers)) {
if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) { continue;
$temp_dir = unslashify($RCMAIL->config->get('temp_dir')); }
$path = tempnam($temp_dir, 'rcmAttmnt');
if ($fp = fopen($path, 'w')) {
$RCMAIL->storage->get_raw_body($message->uid, $fp);
fclose($fp);
} else
return false;
} else {
$data = $RCMAIL->storage->get_raw_body($message->uid);
}
$attachment = array( if (!empty($message->headers->charset)) {
'group' => $COMPOSE['id'], $storage->set_charset($message->headers->charset);
'name' => $name, }
'mimetype' => 'message/rfc822',
'data' => $data,
'path' => $path,
'size' => $path ? filesize($path) : strlen($data),
);
$attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment); if (empty($MESSAGE->subject)) {
$MESSAGE->subject = $message->subject;
}
if ($attachment['status']) { // generate (unique) attachment name
unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']); $name = strlen($message->subject) ? mb_substr($message->subject, 0, 64) : 'message_rfc822';
$COMPOSE['attachments'][$attachment['id']] = $attachment; if (!empty($names[$name])) {
return true; $names[$name]++;
} else if ($path) { $name .= '_' . $names[$name];
@unlink($path); }
} $names[$name] = 1;
$name .= '.eml';
$data = $path = null;
// don't load too big attachments into memory
if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
$temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
$path = tempnam($temp_dir, 'rcmAttmnt');
if ($fp = fopen($path, 'w')) {
$storage->get_raw_body($message->uid, $fp);
fclose($fp);
}
else {
return false;
}
}
else {
$data = $storage->get_raw_body($message->uid);
$curr_mem += $message->size;
}
return false; $attachment = array(
'group' => $COMPOSE['id'],
'name' => $name,
'mimetype' => 'message/rfc822',
'data' => $data,
'path' => $path,
'size' => $path ? filesize($path) : strlen($data),
);
$attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
if ($attachment['status']) {
unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
$COMPOSE['attachments'][$attachment['id']] = $attachment;
}
else if ($path) {
@unlink($path);
}
}
} }

1
program/steps/mail/folders.inc
Unescape Escape View File

@ -65,6 +65,7 @@ else if ($RCMAIL->action == 'purge')
if (!empty($_REQUEST['_reload'])) { if (!empty($_REQUEST['_reload'])) {
$OUTPUT->set_env('messagecount', 0); $OUTPUT->set_env('messagecount', 0);
$OUTPUT->set_env('pagecount', 0); $OUTPUT->set_env('pagecount', 0);
$OUTPUT->set_env('exists', 0);
$OUTPUT->command('message_list.clear'); $OUTPUT->command('message_list.clear');
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox);
$OUTPUT->command('set_unread_count', $mbox, 0); $OUTPUT->command('set_unread_count', $mbox, 0);

1
program/steps/mail/list.inc
Unescape Escape View File

@ -95,6 +95,7 @@ $OUTPUT->set_env('messagecount', $count);
$OUTPUT->set_env('pagecount', $pages); $OUTPUT->set_env('pagecount', $pages);
$OUTPUT->set_env('threading', $threading); $OUTPUT->set_env('threading', $threading);
$OUTPUT->set_env('current_page', $count ? $RCMAIL->storage->get_page() : 1); $OUTPUT->set_env('current_page', $count ? $RCMAIL->storage->get_page() : 1);
$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name);
$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text()); $OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());

7
program/steps/mail/move_del.inc
Unescape Escape View File

@ -38,7 +38,7 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_targe
if (!$moved) { if (!$moved) {
// send error message // send error message
if ($_POST['_from'] != 'show') if ($_POST['_from'] != 'show')
$OUTPUT->command('list_mailbox'); $OUTPUT->command('list_mailbox');
rcmail_display_server_error('errormoving'); rcmail_display_server_error('errormoving');
$OUTPUT->send(); $OUTPUT->send();
@ -59,7 +59,7 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
if (!$del) { if (!$del) {
// send error message // send error message
if ($_POST['_from'] != 'show') if ($_POST['_from'] != 'show')
$OUTPUT->command('list_mailbox'); $OUTPUT->command('list_mailbox');
rcmail_display_server_error('errordeleting'); rcmail_display_server_error('errordeleting');
$OUTPUT->send(); $OUTPUT->send();
@ -111,6 +111,7 @@ else
$OUTPUT->set_env('messagecount', $msg_count); $OUTPUT->set_env('messagecount', $msg_count);
$OUTPUT->set_env('current_page', $page); $OUTPUT->set_env('current_page', $page);
$OUTPUT->set_env('pagecount', $pages); $OUTPUT->set_env('pagecount', $pages);
$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox, 'EXISTS', true));
// update mailboxlist // update mailboxlist
$mbox = $RCMAIL->storage->get_folder(); $mbox = $RCMAIL->storage->get_folder();
@ -144,5 +145,3 @@ else
// send response // send response
$OUTPUT->send(); $OUTPUT->send();

1
program/steps/mail/search.inc
Unescape Escape View File

@ -143,5 +143,6 @@ else {
$OUTPUT->set_env('search_request', $search_str ? $search_request : ''); $OUTPUT->set_env('search_request', $search_str ? $search_request : '');
$OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('messagecount', $count);
$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize())); $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
$OUTPUT->send(); $OUTPUT->send();

3
program/steps/mail/sendmail.inc
Unescape Escape View File

@ -617,13 +617,12 @@ if (is_array($COMPOSE['attachments']))
$ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914 $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
$file = $attachment['data'] ? $attachment['data'] : $attachment['path']; $file = $attachment['data'] ? $attachment['data'] : $attachment['path'];
// .eml attachments send inline
$MAIL_MIME->addAttachment($file, $MAIL_MIME->addAttachment($file,
$ctype, $ctype,
$attachment['name'], $attachment['name'],
($attachment['data'] ? false : true), ($attachment['data'] ? false : true),
($ctype == 'message/rfc822' ? '8bit' : 'base64'), ($ctype == 'message/rfc822' ? '8bit' : 'base64'),
($ctype == 'message/rfc822' ? 'inline' : 'attachment'), 'attachment',
'', '', '', '', '', '',
$CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL, $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
$CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL, $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL,

2
skins/classic/includes/messagetoolbar.html
Unescape Escape View File

@ -27,7 +27,7 @@
<div id="forwardmenu" class="popupmenu"> <div id="forwardmenu" class="popupmenu">
<ul> <ul>
<li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li> <li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li> <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
<roundcube:container name="forwardmenu" id="forwardmenu" /> <roundcube:container name="forwardmenu" id="forwardmenu" />
</ul> </ul>

2
skins/larry/includes/mailtoolbar.html
Unescape Escape View File

@ -17,7 +17,7 @@
<div id="forwardmenu" class="popupmenu"> <div id="forwardmenu" class="popupmenu">
<ul class="toolbarmenu"> <ul class="toolbarmenu">
<li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li> <li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li> <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
<roundcube:container name="forwardmenu" id="forwardmenu" /> <roundcube:container name="forwardmenu" id="forwardmenu" />
</ul> </ul>

Write Preview
Loading…
Cancel
Save