From 83f7077ec930952cdc9cfc8982b80cd4dad06b5f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 07 Jan 2013 08:21:25 -0500
Subject: [PATCH] Fix searching by date in address book (#1488888)
---
program/js/app.js | 580 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 327 insertions(+), 253 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index b804229..c627983 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -21,7 +21,6 @@
function rcube_webmail()
{
- this.env = { recipients_separator:',', recipients_delimiter:', ' };
this.labels = {};
this.buttons = {};
this.buttons_sel = {};
@@ -33,22 +32,24 @@
this.messages = {};
this.group2expand = {};
- // create protected reference to myself
- this.ref = 'rcmail';
- var ref = this;
-
// webmail client settings
this.dblclick_time = 500;
this.message_time = 4000;
-
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
- // default environment vars
- this.env.keep_alive = 60; // seconds
- this.env.request_timeout = 180; // seconds
- this.env.draft_autosave = 0; // seconds
- this.env.comm_path = './';
- this.env.blankpage = 'program/resources/blank.gif';
+ // environment defaults
+ this.env = {
+ request_timeout: 180, // seconds
+ draft_autosave: 0, // seconds
+ comm_path: './',
+ blankpage: 'program/resources/blank.gif',
+ recipients_separator: ',',
+ recipients_delimiter: ', '
+ };
+
+ // create protected reference to myself
+ this.ref = 'rcmail';
+ var ref = this;
// set jQuery ajax options
$.ajaxSetup({
@@ -58,6 +59,7 @@
beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
});
+ // unload fix
$(window).bind('beforeunload', function() { rcmail.unload = true; });
// set environment variable(s)
@@ -82,13 +84,14 @@
// add a button to the button list
this.register_button = function(command, id, type, act, sel, over)
{
- if (!this.buttons[command])
- this.buttons[command] = [];
-
var button_prop = {id:id, type:type};
+
if (act) button_prop.act = act;
if (sel) button_prop.sel = sel;
if (over) button_prop.over = over;
+
+ if (!this.buttons[command])
+ this.buttons[command] = [];
this.buttons[command].push(button_prop);
@@ -188,7 +191,6 @@
this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
if (this.gui_objects.messagelist) {
-
this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
multiselect:true, multiexpand:true, draggable:true, keyboard:true,
column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
@@ -215,17 +217,17 @@
}
if (this.gui_objects.qsearchbox) {
- if (this.env.search_text != null) {
+ if (this.env.search_text != null)
this.gui_objects.qsearchbox.value = this.env.search_text;
- }
$(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
}
this.set_button_titles();
- this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
- 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
- 'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
+ this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
+ 'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
+ 'print', 'load-attachment', 'show-headers', 'hide-headers', 'download',
+ 'forward', 'forward-inline', 'forward-attachment'];
if (this.env.action == 'show' || this.env.action == 'preview') {
this.enable_command(this.env.message_commands, this.env.uid);
@@ -323,7 +325,6 @@
this.enable_command('list', 'listgroup', 'listsearch', 'advanced-search', true);
if (this.gui_objects.contactslist) {
-
this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
{multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
this.contact_list.row_init = function(row){ p.triggerEvent('insertrow', { cid:row.uid, row:row }); };
@@ -339,9 +340,8 @@
this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
- if (this.gui_objects.qsearchbox) {
+ if (this.gui_objects.qsearchbox)
$(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); });
- }
this.update_group_commands();
this.command('list');
@@ -361,13 +361,12 @@
if (this.gui_objects.editform) {
this.enable_command('save', true);
- if (this.env.action == 'add' || this.env.action == 'edit')
+ if (this.env.action == 'add' || this.env.action == 'edit' || this.env.action == 'search')
this.init_contact_form();
}
- if (this.gui_objects.qsearchbox) {
+ if (this.gui_objects.qsearchbox)
this.enable_command('search', 'reset-search', 'moveto', true);
- }
break;
@@ -424,12 +423,14 @@
$('#rcmloginpwd').focus();
// detect client timezone
- var dt = new Date(),
- tz = dt.getTimezoneOffset() / -60,
- stdtz = dt.getStdTimezoneOffset() / -60;
-
- $('#rcmlogintz').val(stdtz);
- $('#rcmlogindst').val(tz > stdtz ? 1 : 0);
+ if (window.jstz && !bw.ie6) {
+ var timezone = jstz.determine();
+ if (timezone.name())
+ $('#rcmlogintz').val(timezone.name());
+ }
+ else {
+ $('#rcmlogintz').val(new Date().getStdTimezoneOffset() / -60);
+ }
// display 'loading' message on form submit, lock submit button
$('form').submit(function () {
@@ -440,10 +441,11 @@
this.enable_command('login', true);
break;
+ }
- default:
- break;
- }
+ // unset contentframe variable if preview_pane is enabled
+ if (this.env.contentframe && !$('#' + this.env.contentframe).is(':visible'))
+ this.env.contentframe = null;
// prevent from form submit with Enter key in file input fields
if (bw.ie)
@@ -480,7 +482,8 @@
this.onloads[i]();
}
- // start keep-alive interval
+ // start keep-alive and refresh intervals
+ this.start_refresh();
this.start_keepalive();
};
@@ -504,6 +507,11 @@
if (this.busy)
return false;
+
+ // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
+ if ((obj && obj.href && String(obj.href).indexOf(location.href) < 0) && rcube_event.get_modifier(event)) {
+ return true;
+ }
// command not supported or allowed
if (!this.commands[command]) {
@@ -560,7 +568,7 @@
break;
case 'about':
- location.href = '?_task=settings&_action=about';
+ this.redirect('?_task=settings&_action=about', false);
break;
case 'permaurl':
@@ -590,7 +598,7 @@
case 'open':
if (uid = this.get_single_uid()) {
- obj.href = '?_task='+this.env.task+'&_action=show&_mbox='+urlencode(this.env.mailbox)+'&_uid='+uid;
+ obj.href = this.url('show', {_mbox: this.env.mailbox, _uid: uid});
return true;
}
break;
@@ -603,9 +611,8 @@
case 'list':
if (props && props != '')
this.reset_qsearch();
- if (this.env.action == 'compose' && this.env.extwin) {
+ if (this.env.action == 'compose' && this.env.extwin)
window.close();
- }
else if (this.task == 'mail') {
this.list_mailbox(props);
this.set_button_titles();
@@ -615,12 +622,11 @@
break;
case 'sort':
- var sort_order, sort_col = props;
+ var sort_order = this.env.sort_order,
+ sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;
- if (this.env.sort_col==sort_col)
- sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
- else
- sort_order = 'ASC';
+ if (!this.env.disabled_sort_order)
+ sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';
// set table header and update env
this.set_list_sorting(sort_col, sort_order);
@@ -646,13 +652,13 @@
break;
case 'expunge':
- if (this.env.messagecount)
+ if (this.env.exists)
this.expunge_mailbox(this.env.mailbox);
break;
case 'purge':
case 'empty-mailbox':
- if (this.env.messagecount)
+ if (this.env.exists)
this.purge_mailbox(this.env.mailbox);
break;
@@ -774,9 +780,8 @@
uid = props._row.uid;
// toggle read/unread
- if (this.message_list.rows[uid].deleted) {
+ if (this.message_list.rows[uid].deleted)
flag = 'undelete';
- }
else if (!this.message_list.rows[uid].unread)
flag = 'unread';
}
@@ -795,7 +800,7 @@
// toggle flagged/unflagged
if (this.message_list.rows[uid].flagged)
flag = 'unflagged';
- }
+ }
this.mark_message(flag, uid);
break;
@@ -815,7 +820,7 @@
var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;
// open attachment in frame if it's of a supported mimetype
- if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, this.env.mimetypes)>=0) {
+ if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, $.map(this.env.mimetypes, function(v,k){ return v })) >= 0) {
if (props.mimetype == 'text/html')
qstring += '&_safe=1';
this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
@@ -871,16 +876,12 @@
case 'previousmessage':
if (this.env.prev_uid)
- this.show_message(this.env.prev_uid, false, this.env.action=='preview');
+ this.show_message(this.env.prev_uid, false, this.env.action == 'preview');
break;
case 'firstmessage':
if (this.env.first_uid)
this.show_message(this.env.first_uid);
- break;
-
- case 'checkmail':
- this.check_for_recent(true);
break;
case 'compose':
@@ -913,7 +914,7 @@
}
if (a_cids.length)
- this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source, }, true);
+ this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
else if (this.env.group)
this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);
@@ -950,9 +951,6 @@
this.auto_save_start();
break;
}
-
- // re-set keep-alive timeout
- this.start_keepalive();
this.submit_messageform(true);
break;
@@ -993,7 +991,7 @@
if (uid = this.get_single_uid()) {
url = {_reply_uid: uid, _mbox: this.env.mailbox};
if (command == 'reply-all')
- // do reply-list, when list is detected and popup menu wasn't used
+ // do reply-list, when list is detected and popup menu wasn't used
url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
else if (command == 'reply-list')
url._all = 'list';
@@ -1003,10 +1001,12 @@
break;
case 'forward-attachment':
+ case 'forward-inline':
case 'forward':
- if (uid = this.get_single_uid()) {
- url = { _forward_uid: uid, _mbox: this.env.mailbox };
- if (command == 'forward-attachment' || (!props && this.env.forward_attachment))
+ var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
+ if (uids.length) {
+ 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;
this.open_compose_step(url);
}
@@ -1387,8 +1387,8 @@
// over the folders
for (k in this.env.folder_coords) {
pos = this.env.folder_coords[k];
- if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
- if ((check = this.check_droptarget(k))) {
+ if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2) {
+ if (check = this.check_droptarget(k)) {
li = this.get_folder_li(k);
div = $(li.getElementsByTagName('div')[0]);
@@ -1402,7 +1402,8 @@
rcmail.command('collapse-folder', rcmail.folder_auto_expand);
rcmail.drag_start(null);
}, 1000);
- } else if (this.folder_auto_timer) {
+ }
+ else if (this.folder_auto_timer) {
clearTimeout(this.folder_auto_timer);
this.folder_auto_timer = null;
this.folder_auto_expand = null;
@@ -1412,9 +1413,10 @@
this.env.folder_coords[k].on = 1;
this.env.last_folder_target = k;
layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
- } else { // Clear target, otherwise drag end will trigger move into last valid droptarget
- this.env.last_folder_target = null;
}
+ // Clear target, otherwise drag end will trigger move into last valid droptarget
+ else
+ this.env.last_folder_target = null;
}
else if (pos.on) {
$(this.get_folder_li(k)).removeClass('droptarget');
@@ -1524,22 +1526,22 @@
if (this.preview_read_timer)
clearTimeout(this.preview_read_timer);
- var selected = list.get_single_selection() != null;
+ var selected = list.get_single_selection();
- this.enable_command(this.env.message_commands, selected);
+ this.enable_command(this.env.message_commands, selected != null);
if (selected) {
// Hide certain command buttons when Drafts folder is selected
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
else {
- var msg = this.env.messages[list.get_single_selection()];
+ var msg = this.env.messages[selected];
if (!msg.ml)
this.enable_command('reply-list', false);
}
}
// 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
if (selected || (list.selection.length && list.selection.length != list.rowcount))
@@ -1641,27 +1643,31 @@
this.check_droptarget = function(id)
{
- var allow = false, copy = false;
-
if (this.task == 'mail')
- allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
- else if (this.task == 'settings')
- allow = (id != this.env.mailbox);
- else if (this.task == 'addressbook') {
+ return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual) ? 1 : 0;
+
+ if (this.task == 'settings')
+ return id != this.env.mailbox ? 1 : 0;
+
+ if (this.task == 'addressbook') {
if (id != this.env.source && this.env.contactfolders[id]) {
+ // droptarget is a group - contact add to group action
if (this.env.contactfolders[id].type == 'group') {
var target_abook = this.env.contactfolders[id].source;
- allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
- copy = target_abook != this.env.source;
+ if (this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly) {
+ // search result may contain contacts from many sources
+ return (this.env.selection_sources.length > 1 || $.inArray(target_abook, this.env.selection_sources) == -1) ? 2 : 1;
+ }
}
- else {
- allow = !this.env.contactfolders[id].readonly;
- copy = true;
+ // droptarget is a (writable) addressbook - contact copy action
+ else if (!this.env.contactfolders[id].readonly) {
+ // search result may contain contacts from many sources
+ return (this.env.selection_sources.length > 1 || $.inArray(id, this.env.selection_sources) == -1) ? 2 : 0;
}
}
}
- return allow ? (copy ? 2 : 1) : 0;
+ return 0;
};
this.open_window = function(url, width, height)
@@ -2061,6 +2067,15 @@
else if (this.task == 'mail')
this.list_mailbox(this.env.mailbox, page);
}
+ };
+
+ // sends request to check for recent messages
+ this.checkmail = function()
+ {
+ var lock = this.set_busy(true, 'checkingmail'),
+ params = this.check_recent_params();
+
+ this.http_request('check-recent', params, lock);
};
// list messages of a specific mailbox using filter
@@ -2545,27 +2560,18 @@
if (mbox && typeof mbox === 'object')
mbox = mbox.id;
- // exit if current or no mailbox specified or if selection is empty
- if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+ // exit if current or no mailbox specified
+ if (!mbox || mbox == this.env.mailbox)
return;
- var a_uids = [], n, selection,
- 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 : '')};
+ var post_data = this.selection_post_data({_target_mbox: mbox});
- 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
- 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
@@ -2574,12 +2580,15 @@
if (mbox && typeof mbox === 'object')
mbox = mbox.id;
- // exit if current or no mailbox specified or if selection is empty
- if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+ // exit if current or no mailbox specified
+ if (!mbox || mbox == this.env.mailbox)
return;
- var lock = false,
- add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
+ var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});
+
+ // exit if selection is empty
+ if (!post_data._uid)
+ return;
// show wait message
if (this.env.action == 'show')
@@ -2590,7 +2599,7 @@
// Hide message command buttons until a message is selected
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
@@ -2598,7 +2607,7 @@
{
var uid, i, len, trash = this.env.trash_mailbox,
list = this.message_list,
- selection = list ? $.merge([], list.get_selection()) : [];
+ selection = list ? list.get_selection() : [];
// exit if no mailbox specified or if selection is empty
if (!this.env.uid && !selection.length)
@@ -2608,7 +2617,7 @@
for (i=0, len=selection.length; i<len; i++) {
uid = selection[i];
if (list.rows[uid].has_children && !list.rows[uid].expanded)
- list.select_childs(uid);
+ list.select_children(uid);
}
// if config is set to flag for deletion
@@ -2617,7 +2626,6 @@
return false;
}
// 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)
this.permanently_remove_messages();
// we're in Junk folder and delete_junk is enabled
@@ -2640,32 +2648,29 @@
// delete the selected messages permanently
this.permanently_remove_messages = function()
{
- // exit if no mailbox specified or if selection is empty
- if (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))
+ var post_data = this.selection_post_data();
+
+ // exit if selection is empty
+ if (!post_data._uid)
return;
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
// @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')
- post_data = {};
-
- if (this.env.uid)
- a_uids[0] = this.env.uid;
- else {
+ // update the list (remove rows, clear selection)
+ if (this.message_list) {
var n, id, root, roots = [],
selection = this.message_list.get_selection();
for (n=0, len=selection.length; n<len; n++) {
id = selection[n];
- a_uids.push(id);
if (this.env.threading) {
count += this.update_thread(id);
@@ -2685,10 +2690,6 @@
}
}
- // 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)
post_data._next_uid = this.env.next_uid;
@@ -2697,9 +2698,6 @@
// remove threads from the end of the list
else if (count > 0)
this.delete_excessive_thread_rows();
-
- post_data._uid = this.uids_to_list(a_uids);
- post_data._mbox = this.env.mailbox;
if (!lock) {
msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
@@ -2710,22 +2708,41 @@
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
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;
if (uid)
a_uids[0] = uid;
else if (this.env.uid)
a_uids[0] = this.env.uid;
- else if (list) {
- selection = list.get_selection();
- for (n=0, len=selection.length; n<len; n++) {
- a_uids.push(selection[n]);
- }
- }
+ else if (list)
+ a_uids = list.get_selection();
if (!list)
r_uids = a_uids;
@@ -2733,12 +2750,12 @@
list.focus();
for (n=0, len=a_uids.length; n<len; n++) {
id = a_uids[n];
- if ((flag=='read' && list.rows[id].unread)
- || (flag=='unread' && !list.rows[id].unread)
- || (flag=='delete' && !list.rows[id].deleted)
- || (flag=='undelete' && list.rows[id].deleted)
- || (flag=='flagged' && !list.rows[id].flagged)
- || (flag=='unflagged' && list.rows[id].flagged))
+ if ((flag == 'read' && list.rows[id].unread)
+ || (flag == 'unread' && !list.rows[id].unread)
+ || (flag == 'delete' && !list.rows[id].deleted)
+ || (flag == 'undelete' && list.rows[id].deleted)
+ || (flag == 'flagged' && !list.rows[id].flagged)
+ || (flag == 'unflagged' && list.rows[id].flagged))
{
r_uids.push(id);
}
@@ -2769,16 +2786,12 @@
this.toggle_read_status = function(flag, a_uids)
{
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');
// mark all message rows as read/unread
for (i=0; i<len; i++)
- 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.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));
this.http_post('mark', post_data, lock);
@@ -2790,16 +2803,12 @@
this.toggle_flagged_status = function(flag, a_uids)
{
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');
// mark all message rows as flagged/unflagged
for (i=0; i<len; i++)
- 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.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));
this.http_post('mark', post_data, lock);
};
@@ -2838,25 +2847,20 @@
this.flag_as_undeleted = function(a_uids)
{
- var i, len=a_uids.length,
- post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'},
+ var i, len = a_uids.length,
+ post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'undelete'}),
lock = this.display_message(this.get_label('markingmessage'), 'loading');
for (i=0; i<len; i++)
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);
- return true;
};
this.flag_as_deleted = function(a_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'),
rows = this.message_list ? this.message_list.rows : [],
count = 0;
@@ -2887,9 +2891,6 @@
this.delete_excessive_thread_rows();
}
- if (this.env.action)
- post_data._from = this.env.action;
-
// ??
if (r_uids.length)
post_data._ruid = this.uids_to_list(r_uids);
@@ -2897,12 +2898,7 @@
if (this.env.skip_deleted && this.env.display_next && 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);
- return true;
};
// flag as read without mark request (called from backend)
@@ -2982,7 +2978,7 @@
// test if purge command is allowed
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.junk_mailbox) + RegExp.escape(this.env.delimiter))));
};
@@ -3017,10 +3013,13 @@
var url = this.url('mail/compose', p);
// open new compose window
- if (this.env.compose_extwin)
+ if (this.env.compose_extwin && !this.env.extwin) {
this.open_window(url, 1150, 900);
- else
+ }
+ else {
this.redirect(url);
+ window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
+ }
};
// init message compose form: set focus and eventhandlers
@@ -3040,6 +3039,7 @@
// close compose step in opener
if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
setTimeout(function(){ opener.history.back(); }, 100);
+ this.env.opened_extwin = true;
}
// configure parallel autocompletion
@@ -3060,7 +3060,7 @@
this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
// add signature according to selected identity
// if we have HTML editor, signature is added in callback
- if (input_from.prop('type') == 'select-one') {
+ if (input_from.prop('type') == 'select-one' && !this.env.opened_extwin) {
this.change_identity(input_from[0]);
}
}
@@ -3408,6 +3408,10 @@
message = message.substring(0, p) + sig + message.substring(p, message.length);
cursor_pos = p - 1;
}
+ else if (!message) { // empty message
+ cursor_pos = 0;
+ message = '\n\n' + sig;
+ }
else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
cursor_pos = pos;
@@ -3480,20 +3484,26 @@
if (!form)
return false;
- // get file input field, count files on capable browser
- var i, size = 0, field = $('input[type=file]', form).get(0),
- files = field.files ? field.files.length : field.value ? 1 : 0;
+ // count files and size on capable browser
+ var size = 0, numfiles = 0;
+
+ $('input[type=file]', form).each(function(i, field) {
+ var files = field.files ? field.files.length : (field.value ? 1 : 0);
+
+ // check file size
+ if (field.files) {
+ for (var i=0; i < files; i++)
+ size += field.files[i].size;
+ }
+
+ numfiles += files;
+ });
// create hidden iframe and post upload form
- if (files) {
- // check file size
- if (field.files && this.env.max_filesize && this.env.filesizeerror) {
- for (i=0; i<files; i++)
- size += field.files[i].size;
- if (size && size > this.env.max_filesize) {
- this.display_message(this.env.filesizeerror, 'error');
- return;
- }
+ if (numfiles) {
+ if (this.env.max_filesize && this.env.filesizeerror && size > this.env.max_filesize) {
+ this.display_message(this.env.filesizeerror, 'error');
+ return;
}
var frame_name = this.async_upload_form(form, 'upload', function(e) {
@@ -3518,7 +3528,7 @@
});
// display upload indicator and cancel button
- var content = '<span>' + this.get_label('uploading' + (files > 1 ? 'many' : '')) + '</span>',
+ var content = '<span>' + this.get_label('uploading' + (numfiles > 1 ? 'many' : '')) + '</span>',
ts = frame_name.replace(/^rcmupload/, '');
this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', frame:frame_name, complete:false });
@@ -4079,19 +4089,24 @@
else if (this.env.contentframe)
this.show_contentframe(false);
- // no source = search result, we'll need to detect if any of
- // selected contacts are in writable addressbook to enable edit/delete
if (list.selection.length) {
+ // no source = search result, we'll need to detect if any of
+ // selected contacts are in writable addressbook to enable edit/delete
+ // we'll also need to know sources used in selection for copy
+ // and group-addmember operations (drag&drop)
+ this.env.selection_sources = [];
if (!source) {
for (n in list.selection) {
sid = String(list.selection[n]).replace(/^[^-]+-/, '');
- if (sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly) {
- writable = true;
- break;
+ if (sid && this.env.address_sources[sid]) {
+ writable = writable || !this.env.address_sources[sid].readonly;
+ this.env.selection_sources.push(sid);
}
}
+ this.env.selection_sources = $.unique(this.env.selection_sources);
}
else {
+ this.env.selection_sources.push(this.env.source);
writable = !source.readonly;
}
}
@@ -4242,22 +4257,35 @@
// copy a contact to the specified target (group or directory)
this.copy_contact = function(cid, to)
{
+ var n, dest = to.type == 'group' ? to.source : to.id,
+ source = this.env.source,
+ group = this.env.group ? this.env.group : '';
+
if (!cid)
cid = this.contact_list.get_selection().join(',');
- if (to.type == 'group' && to.source == this.env.source)
- this.group_member_change('add', cid, to.source, to.id);
- else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
- var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
- post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
- _gid: (this.env.group ? this.env.group : '')};
+ if (!cid || !this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
+ return;
- this.http_post('copy', post_data, lock);
+ // search result may contain contacts from many sources, but if there is only one...
+ if (source == '' && this.env.selection_sources.length == 1)
+ source = this.env.selection_sources[0];
+
+ // tagret is a group
+ if (to.type == 'group') {
+ if (dest == source)
+ this.group_member_change('add', cid, dest, to.id);
+ else {
+ var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
+ post_data = {_cid: cid, _source: source, _to: dest, _togid: to.id, _gid: group};
+
+ this.http_post('copy', post_data, lock);
+ }
}
- else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
+ // target is an addressbook
+ else if (to.id != source) {
var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
- post_data = {_cid: cid, _source: this.env.source, _to: to.id,
- _gid: (this.env.group ? this.env.group : '')};
+ post_data = {_cid: cid, _source: source, _to: to.id, _gid: group};
this.http_post('copy', post_data, lock);
}
@@ -4368,10 +4396,11 @@
{
var ref = this, col;
- this.set_photo_actions($('#ff_photo').val());
-
- for (col in this.env.coltypes)
- this.init_edit_field(col, null);
+ if (this.env.coltypes) {
+ this.set_photo_actions($('#ff_photo').val());
+ for (col in this.env.coltypes)
+ this.init_edit_field(col, null);
+ }
$('.contactfieldgroup .row a.deletebutton').click(function() {
ref.delete_edit_field(this);
@@ -5580,7 +5609,7 @@
// save message in order to display after page loaded
if (type != 'loading')
this.pending_message = [msg, type, timeout];
- return false;
+ return 1;
}
type = type ? type : 'notice';
@@ -5641,6 +5670,9 @@
// pass command to parent window
if (this.is_framed())
return parent.rcmail.hide_message(obj, fade);
+
+ if (!this.gui_objects.message)
+ return;
var k, n, i, msg, m = this.messages;
@@ -5806,13 +5838,11 @@
col = this.env.coltypes[n];
if ((cell = thead.rows[0].cells[n]) && (col == 'from' || col == 'to' || col == 'fromto')) {
cell.id = 'rcm'+col;
+ $('span,a', cell).text(this.get_label(col == 'fromto' ? smart_col : col));
// if we have links for sorting, it's a bit more complicated...
- if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
- cell = cell.firstChild;
- cell.onclick = function(){ return rcmail.command('sort', this.__col, this); };
- cell.__col = col;
- }
- cell.innerHTML = this.get_label(col == 'fromto' ? smart_col : col);
+ $('a', cell).click(function(){
+ return rcmail.command('sort', this.id.replace(/^rcm/, ''), this);
+ });
}
}
}
@@ -6042,10 +6072,18 @@
if (lock || lock === null)
this.set_busy(true);
- if (this.is_framed())
+ if (this.is_framed()) {
parent.rcmail.redirect(url, lock);
- else
+ }
+ else {
+ if (this.env.extwin) {
+ if (typeof url == 'string')
+ url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
+ else
+ url._extwin = 1;
+ }
this.location_href(url, window);
+ }
};
this.goto_url = function(action, query, lock)
@@ -6066,6 +6104,9 @@
$('<a>').attr('href', url).appendTo(document.body).get(0).click();
else
target.location.href = url;
+
+ // reset keep-alive interval
+ this.start_keepalive();
};
// send a http request to the server
@@ -6089,6 +6130,9 @@
// send request
this.log('HTTP GET: ' + url);
+ // reset keep-alive interval
+ this.start_keepalive();
+
return $.ajax({
type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
success: function(data){ ref.http_response(data); },
@@ -6111,7 +6155,7 @@
// trigger plugin hook
var result = this.triggerEvent('request'+action, postdata);
if (result !== undefined) {
- // abort if one the handlers returned false
+ // abort if one of the handlers returned false
if (result === false)
return false;
else
@@ -6120,6 +6164,9 @@
// send request
this.log('HTTP POST: ' + url);
+
+ // reset keep-alive interval
+ this.start_keepalive();
return $.ajax({
type: 'POST', url: url, data: postdata, dataType: 'json',
@@ -6207,7 +6254,7 @@
case 'purge':
case 'expunge':
if (this.task == 'mail') {
- if (!this.env.messagecount) {
+ if (!this.env.exists) {
// clear preview pane content
if (this.env.contentframe)
this.show_contentframe(false);
@@ -6220,13 +6267,15 @@
}
break;
+ case 'refresh':
case 'check-recent':
case 'getunread':
case 'search':
this.env.qsearch = null;
case 'list':
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('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);
@@ -6253,6 +6302,9 @@
this.triggerEvent('responseafter', {response: response});
this.triggerEvent('responseafter'+response.action, {response: response});
+
+ // reset keep-alive interval
+ this.start_keepalive();
};
// handle HTTP request errors
@@ -6274,11 +6326,14 @@
else if (request.status == 0 && status != 'abort')
this.display_message(this.get_label('servererror') + ' (No connection)', 'error');
+ // redirect to url specified in location header if not empty
+ var location_url = request.getResponseHeader("Location");
+ if (location_url)
+ this.redirect(location_url);
+
// re-send keep-alive requests after 30 seconds
if (action == 'keep-alive')
- setTimeout(function(){ ref.keep_alive(); }, 30000);
- else if (action == 'check-recent')
- setTimeout(function(){ ref.check_for_recent(false); }, 30000);
+ setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
};
// post the given form to a hidden iframe
@@ -6448,20 +6503,28 @@
}
};
-
- // starts interval for keep-alive/check-recent signal
+ // starts interval for keep-alive signal
this.start_keepalive = function()
{
- if (!this.env.keep_alive || this.env.framed)
+ if (!this.env.session_lifetime || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
return;
- if (this._int)
- clearInterval(this._int);
+ if (this._keepalive)
+ clearInterval(this._keepalive);
- if (this.task == 'mail' && this.gui_objects.mailboxlist)
- this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.task != 'login' && this.env.action != 'print')
- this._int = setInterval(function(){ ref.keep_alive(); }, this.env.keep_alive * 1000);
+ this._keepalive = setInterval(function(){ ref.keep_alive(); }, this.env.session_lifetime * 0.5 * 1000);
+ };
+
+ // starts interval for refresh signal
+ this.start_refresh = function()
+ {
+ if (!this.env.refresh_interval || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
+ return;
+
+ if (this._refresh)
+ clearInterval(this._refresh);
+
+ this._refresh = setInterval(function(){ ref.refresh(); }, this.env.refresh_interval * 1000);
};
// sends keep-alive signal
@@ -6471,29 +6534,39 @@
this.http_request('keep-alive');
};
- // sends request to check for recent messages
- this.check_for_recent = function(refresh)
+ // sends refresh signal
+ this.refresh = function()
{
- if (this.busy)
+ if (this.busy) {
+ // try again after 10 seconds
+ setTimeout(function(){ ref.refresh(); ref.start_refresh(); }, 10000);
return;
-
- var lock, url = {_mbox: this.env.mailbox};
-
- if (refresh) {
- lock = this.set_busy(true, 'checkingmail');
- url._refresh = 1;
- // reset check-recent interval
- this.start_keepalive();
}
- if (this.gui_objects.messagelist)
- url._list = 1;
- if (this.gui_objects.quotadisplay)
- url._quota = 1;
- if (this.env.search_request)
- url._search = this.env.search_request;
+ var params = {}, lock = this.set_busy(true, 'refreshing');
- this.http_request('check-recent', url, lock);
+ if (this.task == 'mail' && this.gui_objects.mailboxlist)
+ params = this.check_recent_params();
+
+ // plugins should bind to 'requestrefresh' event to add own params
+ this.http_request('refresh', params, lock);
+ };
+
+ // returns check-recent request parameters
+ this.check_recent_params = function()
+ {
+ var params = {_mbox: this.env.mailbox};
+
+ if (this.gui_objects.mailboxlist)
+ params._folderlist = 1;
+ if (this.gui_objects.messagelist)
+ params._list = 1;
+ if (this.gui_objects.quotadisplay)
+ params._quota = 1;
+ if (this.env.search_request)
+ params._search = this.env.search_request;
+
+ return params;
};
@@ -6519,7 +6592,8 @@
{
if (obj.selectionEnd !== undefined)
return obj.selectionEnd;
- else if (document.selection && document.selection.createRange) {
+
+ if (document.selection && document.selection.createRange) {
var range = document.selection.createRange();
if (range.parentElement() != obj)
return 0;
@@ -6533,10 +6607,10 @@
gm.setEndPoint('EndToStart', range);
var p = gm.text.length;
- return p<=obj.value.length ? p : -1;
+ return p <= obj.value.length ? p : -1;
}
- else
- return obj.value.length;
+
+ return obj.value.length;
};
// moves cursor to specified position
--
Gitblit v1.9.1