From 10e2dbbb9c49f1721b4d740bc102c10c742a7b76 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 23 Nov 2011 13:53:58 -0500
Subject: [PATCH] Improve clickjacking protection: bust frame or disable all form elements and abort UI initialization
---
program/js/app.js | 940 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 585 insertions(+), 355 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index bbb14e7..cc1eeef 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,7 +3,8 @@
| Roundcube Webmail Client Script |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2010, The Roundcube Dev Team |
+ | Copyright (C) 2005-2011, The Roundcube Dev Team |
+ | Copyright (C) 2011, Kolab Systems AG |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -19,7 +20,7 @@
function rcube_webmail()
{
- this.env = {};
+ this.env = { recipients_separator:',', recipients_delimiter:', ' };
this.labels = {};
this.buttons = {};
this.buttons_sel = {};
@@ -36,14 +37,9 @@
// webmail client settings
this.dblclick_time = 500;
- this.message_time = 2000;
+ this.message_time = 4000;
this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
-
- // mimetypes supported by the browser (default settings)
- this.mimetypes = new Array('text/plain', 'text/html', 'text/xml',
- 'image/jpeg', 'image/gif', 'image/png',
- 'application/x-javascript', 'application/pdf', 'application/x-shockwave-flash');
// default environment vars
this.env.keep_alive = 60; // seconds
@@ -90,12 +86,15 @@
if (over) button_prop.over = over;
this.buttons[command].push(button_prop);
+
+ if (this.loaded)
+ init_button(command, button_prop);
};
// register a specific gui object
this.gui_object = function(name, id)
{
- this.gui_objects[name] = id;
+ this.gui_objects[name] = this.loaded ? rcube_find_object(id) : id;
};
// register a container object
@@ -129,7 +128,7 @@
// initialize webmail client
this.init = function()
{
- var p = this;
+ var n, p = this;
this.task = this.env.task;
// check browser
@@ -139,12 +138,28 @@
}
// find all registered gui containers
- for (var n in this.gui_containers)
+ for (n in this.gui_containers)
this.gui_containers[n] = $('#'+this.gui_containers[n]);
// find all registered gui objects
- for (var n in this.gui_objects)
+ for (n in this.gui_objects)
this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);
+
+ // clickjacking protection
+ if (this.env.x_frame_options) {
+ try {
+ // bust frame if not allowed
+ if (this.env.x_frame_options == 'deny' && top.location.href != self.location.href)
+ top.location.href = self.location.href;
+ else if (top.location.hostname != self.location.hostname)
+ throw 1;
+ } catch (e) {
+ // possible clickjacking attack: disable all form elements
+ $('form').each(function(){ ref.lock_form(this, true); });
+ this.display_message("Blocked: possible clickjacking attack!", 'error');
+ return;
+ }
+ }
// init registered buttons
this.init_buttons();
@@ -156,7 +171,7 @@
}
// enable general commands
- this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'undo', true);
+ this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', true);
if (this.env.permaurl)
this.enable_command('permaurl', true);
@@ -165,7 +180,7 @@
case 'mail':
// enable mail commands
- this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
+ this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
if (this.gui_objects.messagelist) {
@@ -208,7 +223,7 @@
'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
'print', 'load-attachment', 'load-headers', '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('reply-list', this.env.list_post);
@@ -279,6 +294,9 @@
if (this.gui_objects.folderlist)
this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
+ this.enable_command('add', 'import', this.env.writable_source);
+ 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,
@@ -301,6 +319,7 @@
}
this.update_group_commands();
+ this.command('list');
}
this.set_page_buttons();
@@ -320,22 +339,12 @@
if (this.env.action == 'add' || this.env.action == 'edit')
this.init_contact_form();
}
+
if (this.gui_objects.qsearchbox) {
this.enable_command('search', 'reset-search', 'moveto', true);
- $(this.gui_objects.qsearchbox).select();
}
- if (this.contact_list && this.contact_list.rowcount > 0)
- this.enable_command('export', true);
-
- this.enable_command('add', 'import', this.env.writable_source);
- this.enable_command('list', 'listgroup', 'advanced-search', true);
-
- // load contacts of selected source
- if (!this.env.action)
- this.command('list', this.env.source);
break;
-
case 'settings':
this.enable_command('preferences', 'identities', 'save', 'folders', true);
@@ -387,7 +396,12 @@
$('#rcmloginpwd').focus();
// detect client timezone
- $('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);
+ var dt = new Date(),
+ tz = dt.getTimezoneOffset() / -60,
+ stdtz = dt.getStdTimezoneOffset() / -60;
+
+ $('#rcmlogintz').val(stdtz);
+ $('#rcmlogindst').val(tz > stdtz ? 1 : 0);
// display 'loading' message on form submit, lock submit button
$('form').submit(function () {
@@ -446,6 +460,8 @@
// execute a specific command on the web client
this.command = function(command, props, obj)
{
+ var ret, uid, cid, url, flag;
+
if (obj && obj.blur)
obj.blur();
@@ -462,31 +478,33 @@
}
// check input before leaving compose step
- if (this.task=='mail' && this.env.action=='compose' && $.inArray(command, this.env.compose_commands)<0) {
+ if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands)<0) {
if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
return false;
}
// process external commands
if (typeof this.command_handlers[command] === 'function') {
- var ret = this.command_handlers[command](props, obj);
+ ret = this.command_handlers[command](props, obj);
return ret !== undefined ? ret : (obj ? false : true);
}
else if (typeof this.command_handlers[command] === 'string') {
- var ret = window[this.command_handlers[command]](props, obj);
+ ret = window[this.command_handlers[command]](props, obj);
return ret !== undefined ? ret : (obj ? false : true);
}
// trigger plugin hooks
this.triggerEvent('actionbefore', {props:props, action:command});
- var ret = this.triggerEvent('before'+command, props);
+ ret = this.triggerEvent('before'+command, props);
if (ret !== undefined) {
- // abort if one the handlers returned false
+ // abort if one of the handlers returned false
if (ret === false)
return false;
else
props = ret;
}
+
+ ret = undefined;
// process internal command
switch (command) {
@@ -504,6 +522,10 @@
this.switch_task(command);
break;
+ case 'about':
+ location.href = '?_task=settings&_action=about';
+ break;
+
case 'permaurl':
if (obj && obj.href && obj.target)
return true;
@@ -517,7 +539,6 @@
return false;
case 'open':
- var uid;
if (uid = this.get_single_uid()) {
obj.href = '?_task='+this.env.task+'&_action=show&_mbox='+urlencode(this.env.mailbox)+'&_uid='+uid;
return true;
@@ -525,21 +546,15 @@
break;
case 'list':
- if (this.task=='mail') {
- if (!this.env.search_request || (props && props != this.env.mailbox))
- this.reset_qsearch();
-
+ this.reset_qsearch();
+ if (this.task == 'mail') {
this.list_mailbox(props);
if (this.env.trash_mailbox && !this.env.flag_for_deletion)
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task == 'addressbook') {
- if (!this.env.search_request || (props != this.env.source))
- this.reset_qsearch();
-
this.list_contacts(props);
- this.enable_command('add', 'import', this.env.writable_source);
}
break;
@@ -592,7 +607,7 @@
// common commands used in multiple tasks
case 'show':
if (this.task == 'mail') {
- var uid = this.get_single_uid();
+ uid = this.get_single_uid();
if (uid && (!this.env.uid || uid != this.env.uid)) {
if (this.env.mailbox == this.env.drafts_mailbox)
this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
@@ -601,7 +616,7 @@
}
}
else if (this.task == 'addressbook') {
- var cid = props ? props : this.get_single_cid();
+ cid = props ? props : this.get_single_cid();
if (cid && !(this.env.action == 'show' && cid == this.env.cid))
this.load_contact(cid, 'show');
}
@@ -617,13 +632,12 @@
break;
case 'edit':
- var cid;
if (this.task=='addressbook' && (cid = this.get_single_cid()))
this.load_contact(cid, 'edit');
else if (this.task=='settings' && props)
this.load_identity(props, 'edit-identity');
else if (this.task=='mail' && (cid = this.get_single_uid())) {
- var url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
+ url = (this.env.mailbox == this.env.drafts_mailbox) ? '_draft_uid=' : '_uid=';
this.goto_url('compose', url+cid+'&_mbox='+urlencode(this.env.mailbox), true);
}
break;
@@ -701,7 +715,7 @@
if (props && !props._row)
break;
- var uid, flag = 'read';
+ flag = 'read';
if (props._row.uid) {
uid = props._row.uid;
@@ -721,7 +735,7 @@
if (props && !props._row)
break;
- var uid, flag = 'flagged';
+ flag = 'flagged';
if (props._row.uid) {
uid = props._row.uid;
@@ -748,7 +762,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 && $.inArray(props.mimetype, this.mimetypes)>=0) {
+ if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, this.env.mimetypes)>=0) {
if (props.mimetype == 'text/html')
qstring += '&_safe=1';
this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
@@ -817,17 +831,11 @@
break;
case 'compose':
- var url = this.env.comm_path+'&_action=compose';
+ url = this.url('mail/compose');
if (this.task == 'mail') {
url += '&_mbox='+urlencode(this.env.mailbox);
-
- if (this.env.mailbox == this.env.drafts_mailbox) {
- var uid;
- if (uid = this.get_single_uid())
- url += '&_draft_uid='+uid;
- }
- else if (props)
+ if (props)
url += '&_to='+urlencode(props);
}
// modify url if we're in addressbook
@@ -851,10 +859,14 @@
}
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);
break;
}
+ else if (props)
+ url += '&_to='+urlencode(props);
this.redirect(url);
break;
@@ -929,9 +941,8 @@
case 'reply-all':
case 'reply-list':
case 'reply':
- var uid;
if (uid = this.get_single_uid()) {
- var url = '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+ url = '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
if (command == 'reply-all')
// do reply-list, when list is detected and popup menu wasn't used
url += '&_all=' + (!props && this.commands['reply-list'] ? 'list' : 'all');
@@ -944,7 +955,6 @@
case 'forward-attachment':
case 'forward':
- var uid, url;
if (uid = this.get_single_uid()) {
url = '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
if (command == 'forward-attachment' || (!props && this.env.forward_attachment))
@@ -954,7 +964,6 @@
break;
case 'print':
- var uid;
if (uid = this.get_single_uid()) {
ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
if (this.printwin) {
@@ -966,7 +975,6 @@
break;
case 'viewsource':
- var uid;
if (uid = this.get_single_uid()) {
ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
if (this.sourcewin)
@@ -975,7 +983,6 @@
break;
case 'download':
- var uid;
if (uid = this.get_single_uid())
this.goto_url('viewsource', '&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+'&_save=1');
break;
@@ -992,21 +999,24 @@
// reset quicksearch
case 'reset-search':
var n, s = this.env.search_request || this.env.qsearch;
+
this.reset_qsearch();
+ this.select_all_mode = false;
if (s && this.env.mailbox)
- this.list_mailbox(this.env.mailbox);
+ this.list_mailbox(this.env.mailbox, 1);
else if (s && this.task == 'addressbook') {
if (this.env.source == '') {
for (n in this.env.address_sources) break;
this.env.source = n;
this.env.group = '';
}
- this.list_contacts(this.env.source, this.env.group);
+ this.list_contacts(this.env.source, this.env.group, 1);
}
break;
case 'listgroup':
+ this.reset_qsearch();
this.list_contacts(props.source, props.id);
break;
@@ -1053,24 +1063,26 @@
// unified command call (command name == function name)
default:
var func = command.replace(/-/g, '_');
- if (this[func] && typeof this[func] === 'function')
- this[func](props);
+ if (this[func] && typeof this[func] === 'function') {
+ ret = this[func](props);
+ }
break;
}
- this.triggerEvent('after'+command, props);
+ if (this.triggerEvent('after'+command, props) === false)
+ ret = false;
this.triggerEvent('actionafter', {props:props, action:command});
- return obj ? false : true;
+ return ret === false ? false : obj ? false : true;
};
// set command(s) enabled or disabled
this.enable_command = function()
{
- var args = Array.prototype.slice.call(arguments),
+ var i, n, args = Array.prototype.slice.call(arguments),
enable = args.pop(), cmd;
- for (var n=0; n<args.length; n++) {
+ for (n=0; n<args.length; n++) {
cmd = args[n];
// argument of type array
if (typeof cmd === 'string') {
@@ -1079,7 +1091,7 @@
}
// push array elements into commands array
else {
- for (var i in cmd)
+ for (i in cmd)
args.push(cmd[i]);
}
}
@@ -1206,6 +1218,24 @@
this.http_post('save-pref', request);
};
+ this.html_identifier = function(str, encode)
+ {
+ str = String(str);
+ if (encode)
+ return Base64.encode(str).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
+ else
+ return str.replace(this.identifier_expr, '_');
+ };
+
+ this.html_identifier_decode = function(str)
+ {
+ str = String(str).replace(/-/g, '+').replace(/_/g, '/');
+
+ while (str.length % 4) str += '=';
+
+ return Base64.decode(str);
+ };
+
/*********************************************************/
/********* event handling methods *********/
@@ -1214,12 +1244,12 @@
this.drag_menu = function(e, target)
{
var modkey = rcube_event.get_modifier(e),
- menu = $('#'+this.gui_objects.message_dragmenu);
+ menu = this.gui_objects.message_dragmenu;
if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
var pos = rcube_event.get_mouse_pos(e);
this.env.drag_target = target;
- menu.css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
+ $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
return true;
}
@@ -1228,9 +1258,9 @@
this.drag_menu_action = function(action)
{
- var menu = $('#'+this.gui_objects.message_dragmenu);
+ var menu = this.gui_objects.message_dragmenu;
if (menu) {
- menu.hide();
+ $(menu).hide();
}
this.command(action, this.env.drag_target);
this.env.drag_target = null;
@@ -1252,13 +1282,14 @@
this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
this.initialListScrollTop = this.gui_objects.folderlist.parentNode.scrollTop;
- var li, pos, list, height;
- list = $(this.gui_objects.folderlist);
- pos = list.offset();
+ var k, li, height,
+ list = $(this.gui_objects.folderlist);
+ pos = list.offset();
+
this.env.folderlist_coords = { x1:pos.left, y1:pos.top, x2:pos.left + list.width(), y2:pos.top + list.height() };
this.env.folder_coords = [];
- for (var k in model) {
+ for (k in model) {
if (li = this.get_folder_li(k)) {
// only visible folders
if (height = li.firstChild.offsetHeight) {
@@ -1294,19 +1325,18 @@
this.drag_move = function(e)
{
if (this.gui_objects.folderlist && this.env.folder_coords) {
- // offsets to compensate for scrolling while dragging a message
- var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
- var moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
- var toffset = -moffset-boffset;
- var li, div, pos, mouse, check, oldclass,
- layerclass = 'draglayernormal';
+ var k, li, div, check, oldclass,
+ layerclass = 'draglayernormal',
+ mouse = rcube_event.get_mouse_pos(e),
+ pos = this.env.folderlist_coords,
+ // offsets to compensate for scrolling while dragging a message
+ boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop,
+ moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
if (this.contact_list && this.contact_list.draglayer)
oldclass = this.contact_list.draglayer.attr('class');
- mouse = rcube_event.get_mouse_pos(e);
- pos = this.env.folderlist_coords;
- mouse.y += toffset;
+ mouse.y += -moffset-boffset;
// if mouse pointer is outside of folderlist
if (mouse.x < pos.x1 || mouse.x >= pos.x2 || mouse.y < pos.y1 || mouse.y >= pos.y2) {
@@ -1321,10 +1351,10 @@
}
// over the folders
- for (var k in this.env.folder_coords) {
+ 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 ((check = this.check_droptarget(k))) {
li = this.get_folder_li(k);
div = $(li.getElementsByTagName('div')[0]);
@@ -1335,9 +1365,9 @@
this.folder_auto_expand = k;
this.folder_auto_timer = window.setTimeout(function() {
- rcmail.command('collapse-folder', rcmail.folder_auto_expand);
- rcmail.drag_start(null);
- }, 1000);
+ rcmail.command('collapse-folder', rcmail.folder_auto_expand);
+ rcmail.drag_start(null);
+ }, 1000);
} else if (this.folder_auto_timer) {
window.clearTimeout(this.folder_auto_timer);
this.folder_auto_timer = null;
@@ -1363,31 +1393,29 @@
}
};
- this.collapse_folder = function(id)
+ this.collapse_folder = function(name)
{
- var li = this.get_folder_li(id),
- div = $(li.getElementsByTagName('div')[0]);
-
- if (!div || (!div.hasClass('collapsed') && !div.hasClass('expanded')))
- return;
-
- var ul = $(li.getElementsByTagName('ul')[0]);
+ var li = this.get_folder_li(name, '', true),
+ div = $('div:first', li),
+ ul = $('ul:first', li);
if (div.hasClass('collapsed')) {
ul.show();
div.removeClass('collapsed').addClass('expanded');
- var reg = new RegExp('&'+urlencode(id)+'&');
+ var reg = new RegExp('&'+urlencode(name)+'&');
this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
}
- else {
+ else if (div.hasClass('expanded')) {
ul.hide();
div.removeClass('expanded').addClass('collapsed');
- this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(id)+'&';
+ this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
// select parent folder if one of its childs is currently selected
- if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
- this.command('list', id);
+ if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0)
+ this.command('list', name);
}
+ else
+ return;
// Work around a bug in IE6 and IE7, see #1485309
if (bw.ie6 || bw.ie7) {
@@ -1399,12 +1427,16 @@
}
this.command('save-pref', { name: 'collapsed_folders', value: this.env.collapsed_folders });
- this.set_unread_count_display(id, false);
+ this.set_unread_count_display(name, false);
};
this.doc_mouse_up = function(e)
{
var model, list, li, id;
+
+ // ignore event if jquery UI dialog is open
+ if ($(rcube_event.get_target(e)).closest('.ui-dialog, .ui-widget-overlay').length)
+ return;
if (list = this.message_list) {
if (!rcube_mouse_is_over(e, list.list.parentNode))
@@ -1527,11 +1559,12 @@
this.msglist_keypress = function(list)
{
+ if (list.modkey == CONTROL_KEY)
+ return;
+
if (list.key_pressed == list.ENTER_KEY)
this.command('show');
- else if (list.key_pressed == list.DELETE_KEY)
- this.command('delete');
- else if (list.key_pressed == list.BACKSPACE_KEY)
+ else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
this.command('delete');
else if (list.key_pressed == 33)
this.command('previouspage');
@@ -1645,14 +1678,18 @@
if (!this.gui_objects.messagelist || !this.message_list)
return false;
+ // Prevent from adding messages from different folder (#1487752)
+ if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
+ return false;
+
if (!this.env.messages[uid])
this.env.messages[uid] = {};
// merge flags over local message object
$.extend(this.env.messages[uid], {
deleted: flags.deleted?1:0,
- replied: flags.replied?1:0,
- unread: flags.unread?1:0,
+ replied: flags.answered?1:0,
+ unread: !flags.seen?1:0,
forwarded: flags.forwarded?1:0,
flagged: flags.flagged?1:0,
has_children: flags.has_children?1:0,
@@ -1666,23 +1703,18 @@
flags: flags.extra_flags
});
- var c, html, tree = expando = '',
+ var c, n, col, html, tree = '', expando = '',
list = this.message_list,
rows = list.rows,
- tbody = this.gui_objects.messagelist.tBodies[0],
- rowcount = tbody.rows.length,
- even = rowcount%2,
message = this.env.messages[uid],
css_class = 'message'
- + (even ? ' even' : ' odd')
- + (flags.unread ? ' unread' : '')
+ + (!flags.seen ? ' unread' : '')
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
- + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+ + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
+ (message.selected ? ' selected' : ''),
// for performance use DOM instead of jQuery here
- row = document.createElement('tr'),
- col = document.createElement('td');
+ row = document.createElement('tr');
row.id = 'rcmrow'+uid;
row.className = css_class;
@@ -1693,12 +1725,12 @@
css_class += ' status';
if (flags.deleted)
css_class += ' deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class += ' unread';
else if (flags.unread_children > 0)
css_class += ' unreadchildren';
}
- if (flags.replied)
+ if (flags.answered)
css_class += ' replied';
if (flags.forwarded)
css_class += ' forwarded';
@@ -1709,9 +1741,10 @@
// threads
if (this.env.threading) {
- // This assumes that div width is hardcoded to 15px,
- var width = message.depth * 15;
if (message.depth) {
+ // This assumes that div width is hardcoded to 15px,
+ tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + (message.depth * 15) + 'px;"> </span>';
+
if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
|| ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
(!rows[message.parent_uid] || !rows[message.parent_uid].expanded))
@@ -1726,13 +1759,9 @@
if (message.expanded === undefined && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
message.expanded = true;
}
- }
- if (width)
- tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + width + 'px;"> </span>';
-
- if (message.has_children && !message.depth)
expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>';
+ }
}
tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
@@ -1746,7 +1775,7 @@
}
// add each submitted col
- for (var n in this.env.coltypes) {
+ for (n in this.env.coltypes) {
c = this.env.coltypes[n];
col = document.createElement('td');
col.className = String(c).toLowerCase();
@@ -1766,7 +1795,7 @@
else if (c == 'status') {
if (flags.deleted)
css_class = 'deleted';
- else if (flags.unread)
+ else if (!flags.seen)
css_class = 'unread';
else if (flags.unread_children > 0)
css_class = 'unreadchildren';
@@ -1776,8 +1805,17 @@
}
else if (c == 'threads')
html = expando;
- else if (c == 'subject')
+ else if (c == 'subject') {
+ if (bw.ie)
+ col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
html = tree + cols[c];
+ }
+ else if (c == 'priority') {
+ if (flags.prio > 0 && flags.prio < 6)
+ html = '<span class="prio'+flags.prio+'"> </span>';
+ else
+ html = ' ';
+ }
else
html = cols[c];
@@ -1941,18 +1979,13 @@
// list messages of a specific mailbox using filter
this.filter_mailbox = function(filter)
{
- var search, lock = this.set_busy(true, 'searching');
-
- if (this.gui_objects.qsearchbox)
- search = this.gui_objects.qsearchbox.value;
+ var lock = this.set_busy(true, 'searching');
this.clear_message_list();
// reset vars
this.env.current_page = 1;
- this.http_request('search', '_filter='+filter
- + (search ? '&_q='+urlencode(search) : '')
- + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), lock);
+ this.http_request('search', this.search_params(false, filter), lock);
};
// list messages of a specific mailbox
@@ -1987,7 +2020,7 @@
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
url += '&_refresh=1';
- this.select_folder(mbox, this.env.mailbox);
+ this.select_folder(mbox, '', true);
this.env.mailbox = mbox;
// load message list remotely
@@ -2051,8 +2084,7 @@
new_row = tbody.firstChild;
while (new_row) {
- if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
- && r.unread_children) {
+ if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
this.message_list.expand_all(r);
this.set_unread_children(r.uid);
}
@@ -2087,8 +2119,12 @@
};
// Initializes threads indicators/expanders after list update
- this.init_threads = function(roots)
+ this.init_threads = function(roots, mbox)
{
+ // #1487752
+ if (mbox && mbox != this.env.mailbox)
+ return false;
+
for (var n=0, len=roots.length; n<len; n++)
this.add_tree_icons(roots[n]);
this.expand_threads();
@@ -2492,7 +2528,7 @@
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
- if (list && list.shiftkey) {
+ if (list && list.modkey == SHIFT_KEY) {
if (confirm(this.get_label('deletemessagesconfirm')))
this.permanently_remove_messages();
}
@@ -2795,14 +2831,15 @@
this.expunge_mailbox = function(mbox)
{
- var lock = false,
- url = '_mbox='+urlencode(mbox);
+ var lock, url = '_mbox='+urlencode(mbox);
// lock interface if it's the active mailbox
if (mbox == this.env.mailbox) {
- lock = this.set_busy(true, 'loading');
- url += '&_reload=1';
- }
+ lock = this.set_busy(true, 'loading');
+ url += '&_reload=1';
+ if (this.env.search_request)
+ url += '&_search='+this.env.search_request;
+ }
// send request to server
this.http_post('expunge', url, lock);
@@ -2914,6 +2951,8 @@
this.init_address_input_events = function(obj, props)
{
+ this.env.recipients_delimiter = this.env.recipients_separator + ' ';
+
obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })
.attr('autocomplete', 'off');
};
@@ -3151,7 +3190,7 @@
sig = this.env.signatures[sig].is_html ? this.env.signatures[sig].plain_text : this.env.signatures[sig].text;
sig = sig.replace(/\r\n/g, '\n');
- if (!sig.match(/^--[ -]\n/))
+ if (!sig.match(/^--[ -]\n/m))
sig = sig_separator + '\n' + sig;
p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
@@ -3163,7 +3202,7 @@
sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
sig = sig.replace(/\r\n/g, '\n');
- if (!sig.match(/^--[ -]\n/))
+ if (!sig.match(/^--[ -]\n/m))
sig = sig_separator + '\n' + sig;
if (this.env.sig_above) {
@@ -3232,12 +3271,12 @@
if (this.env.signatures[id]) {
if (this.env.signatures[id].is_html) {
sig = this.env.signatures[id].text;
- if (!this.env.signatures[id].plain_text.match(/^--[ -]\r?\n/))
+ if (!this.env.signatures[id].plain_text.match(/^--[ -]\r?\n/m))
sig = sig_separator + '<br />' + sig;
}
else {
sig = this.env.signatures[id].text;
- if (!sig.match(/^--[ -]\r?\n/))
+ if (!sig.match(/^--[ -]\r?\n/m))
sig = sig_separator + '\n' + sig;
sig = '<pre>' + sig + '</pre>';
}
@@ -3341,16 +3380,8 @@
this.remove_from_attachment_list = function(name)
{
- if (this.env.attachments[name])
- delete this.env.attachments[name];
-
- if (!this.gui_objects.attachmentlist)
- return false;
-
- var list = this.gui_objects.attachmentlist.getElementsByTagName("li");
- for (i=0; i<list.length; i++)
- if (list[i].id == name)
- this.gui_objects.attachmentlist.removeChild(list[i]);
+ delete this.env.attachments[name];
+ $('#'+name).remove();
};
this.remove_attachment = function(name)
@@ -3403,38 +3434,56 @@
this.qsearch = function(value)
{
if (value != '') {
- var n, r, addurl = '', mods_arr = [],
- mods = this.env.search_mods,
- mbox = this.env.mailbox,
- lock = this.set_busy(true, 'searching');
+ var n, lock = this.set_busy(true, 'searching');
- if (this.message_list) {
+ if (this.message_list)
this.clear_message_list();
- if (mods)
- mods = mods[mbox] ? mods[mbox] : mods['*'];
- } else if (this.contact_list) {
+ else if (this.contact_list)
this.list_contacts_clear();
- }
+
+ // reset vars
+ this.env.current_page = 1;
+ r = this.http_request('search', this.search_params(value)
+ + (this.env.source ? '&_source='+urlencode(this.env.source) : '')
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''), lock);
+
+ this.env.qsearch = {lock: lock, request: r};
+ }
+ };
+
+ // build URL params for search
+ this.search_params = function(search, filter)
+ {
+ var n, url = [], mods_arr = [],
+ mods = this.env.search_mods,
+ mbox = this.env.mailbox;
+
+ if (!filter && this.gui_objects.search_filter)
+ filter = this.gui_objects.search_filter.value;
+
+ if (!search && this.gui_objects.qsearchbox)
+ search = this.gui_objects.qsearchbox.value;
+
+ if (filter)
+ url.push('_filter=' + urlencode(filter));
+
+ if (search) {
+ url.push('_q='+urlencode(search));
+
+ if (mods && this.message_list)
+ mods = mods[mbox] ? mods[mbox] : mods['*'];
if (mods) {
for (n in mods)
mods_arr.push(n);
- addurl += '&_headers='+mods_arr.join(',');
+ url.push('_headers='+mods_arr.join(','));
}
-
- if (this.gui_objects.search_filter)
- addurl += '&_filter=' + this.gui_objects.search_filter.value;
-
- // reset vars
- this.env.current_page = 1;
- r = this.http_request('search', '_q='+urlencode(value)
- + (mbox ? '&_mbox='+urlencode(mbox) : '')
- + (this.env.source ? '&_source='+urlencode(this.env.source) : '')
- + (this.env.group ? '&_gid='+urlencode(this.env.group) : '')
- + (addurl ? addurl : ''), lock);
-
- this.env.qsearch = {lock: lock, request: r};
}
+
+ if (mbox)
+ url.push('_mbox='+urlencode(mbox));
+
+ return url.join('&');
};
// reset quick-search form
@@ -3448,6 +3497,7 @@
this.env.qsearch = null;
this.env.search_request = null;
+ this.env.search_id = null;
};
this.sent_successfully = function(type, msg)
@@ -3489,13 +3539,15 @@
return rcube_event.cancel(e);
- case 9: // tab
- if (mod == SHIFT_KEY)
- break;
+ case 9: // tab
+ if (mod == SHIFT_KEY || !this.ksearch_visible()) {
+ this.ksearch_hide();
+ return;
+ }
case 13: // enter
- if (this.ksearch_selected === null || !this.ksearch_value)
- break;
+ if (!this.ksearch_visible())
+ return false;
// insert selected address and hide ksearch pane
this.insert_recipient(this.ksearch_selected);
@@ -3505,7 +3557,7 @@
case 27: // escape
this.ksearch_hide();
- break;
+ return;
case 37: // left
case 39: // right
@@ -3518,6 +3570,11 @@
this.ksearch_input = obj;
return true;
+ };
+
+ this.ksearch_visible = function()
+ {
+ return (this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value);
};
this.ksearch_select = function(node)
@@ -3535,7 +3592,7 @@
this.insert_recipient = function(id)
{
- if (!this.env.contacts[id] || !this.ksearch_input)
+ if (id === null || !this.env.contacts[id] || !this.ksearch_input)
return;
// get cursor pos
@@ -3552,13 +3609,13 @@
// insert all members of a group
if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
- insert += this.env.contacts[id].name + ', ';
+ insert += this.env.contacts[id].name + this.env.recipients_delimiter;
this.group2expand = $.extend({}, this.env.contacts[id]);
this.group2expand.input = this.ksearch_input;
this.http_request('mail/group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
}
else if (typeof this.env.contacts[id] === 'string') {
- insert = this.env.contacts[id] + ', ';
+ insert = this.env.contacts[id] + this.env.recipients_delimiter;
trigger = true;
}
@@ -3595,9 +3652,10 @@
// get string from current cursor pos to last comma
var cpos = this.get_caret_pos(this.ksearch_input),
- p = inp_value.lastIndexOf(',', cpos-1),
+ p = inp_value.lastIndexOf(this.env.recipients_separator, cpos-1),
q = inp_value.substring(p+1, cpos),
- min = this.env.autocomplete_min_length;
+ min = this.env.autocomplete_min_length,
+ ac = this.ksearch_data;
// trim query string
q = $.trim(q);
@@ -3606,28 +3664,25 @@
if (q == this.ksearch_value)
return;
+ this.ksearch_destroy();
+
if (q.length && q.length < min) {
- if (!this.env.acinfo) {
- this.env.acinfo = this.display_message(
+ if (!this.ksearch_info) {
+ this.ksearch_info = this.display_message(
this.get_label('autocompletechars').replace('$min', min));
}
return;
- }
- else if (this.env.acinfo) {
- this.hide_message(this.env.acinfo);
}
var old_value = this.ksearch_value;
this.ksearch_value = q;
- this.ksearch_destroy();
-
// ...string is empty
if (!q.length)
return;
- // ...new search value contains old one and previous search result was empty
- if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
+ // ...new search value contains old one and previous search was not finished or its result was empty
+ if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac || !ac.num) && this.env.contacts && !this.env.contacts.length)
return;
var i, lock, source, xhr, reqid = new Date().getTime(),
@@ -3635,7 +3690,8 @@
sources = props && props.sources ? props.sources : [],
action = props && props.action ? props.action : 'mail/autocomplete';
- this.ksearch_data = {id: reqid, sources: sources.slice(), action: action, locks: [], requests: []};
+ this.ksearch_data = {id: reqid, sources: sources.slice(), action: action,
+ locks: [], requests: [], num: sources.length};
for (i=0; i<threads; i++) {
source = this.ksearch_data.sources.shift();
@@ -3662,7 +3718,9 @@
return;
// display search results
- var p, ul, li, text, init, s_val = this.ksearch_value,
+ var i, len, ul, li, text, init,
+ value = this.ksearch_value,
+ data = this.ksearch_data,
maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;
// create results pane if not present
@@ -3691,11 +3749,11 @@
}
// add each result line to list
- if (results && results.length) {
- for (i=0; i < results.length && maxlen > 0; i++) {
+ if (results && (len = results.length)) {
+ for (i=0; i < len && maxlen > 0; i++) {
text = typeof results[i] === 'object' ? results[i].name : results[i];
li = document.createElement('LI');
- li.innerHTML = text.replace(new RegExp('('+RegExp.escape(s_val)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = this.env.contacts.length + i;
@@ -3713,19 +3771,28 @@
}
}
- if (results && results.length)
+ if (len)
this.env.contacts = this.env.contacts.concat(results);
// run next parallel search
- if (maxlen > 0 && this.ksearch_data.id == reqid && this.ksearch_data.sources.length) {
- var lock, xhr, props = this.ksearch_data, source = props.sources.shift();
- if (source) {
- lock = this.display_message(this.get_label('searching'), 'loading');
- xhr = this.http_post(props.action, '_search='+urlencode(s_val)+'&_id='+reqid
- +'&_source='+urlencode(source), lock);
+ if (data.id == reqid) {
+ data.num--;
+ if (maxlen > 0 && data.sources.length) {
+ var lock, xhr, source = data.sources.shift();
+ if (source) {
+ lock = this.display_message(this.get_label('searching'), 'loading');
+ xhr = this.http_post(data.action, '_search='+urlencode(value)+'&_id='+reqid
+ +'&_source='+urlencode(source), lock);
- this.ksearch_data.locks.push(lock);
- this.ksearch_data.requests.push(xhr);
+ this.ksearch_data.locks.push(lock);
+ this.ksearch_data.requests.push(xhr);
+ }
+ }
+ else if (!maxlen) {
+ if (!this.ksearch_msg)
+ this.ksearch_msg = this.display_message(this.get_label('autocompletemore'));
+ // abort pending searches
+ this.ksearch_abort();
}
}
};
@@ -3759,8 +3826,24 @@
this.ksearch_destroy();
};
- // Aborts pending autocomplete requests
+ // Clears autocomplete data/requests
this.ksearch_destroy = function()
+ {
+ this.ksearch_abort();
+
+ if (this.ksearch_info)
+ this.hide_message(this.ksearch_info);
+
+ if (this.ksearch_msg)
+ this.hide_message(this.ksearch_msg);
+
+ this.ksearch_data = null;
+ this.ksearch_info = null;
+ this.ksearch_msg = null;
+ }
+
+ // Aborts pending autocomplete requests
+ this.ksearch_abort = function()
{
var i, len, ac = this.ksearch_data;
@@ -3769,9 +3852,8 @@
for (i=0, len=ac.locks.length; i<len; i++)
this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
+ };
- this.ksearch_data = null;
- }
/*********************************************************/
/********* address book methods *********/
@@ -3813,7 +3895,7 @@
}
}
- this.enable_command('compose', list.selection.length > 0);
+ this.enable_command('compose', this.env.group || list.selection.length > 0);
this.enable_command('edit', id && writable);
this.enable_command('delete', list.selection.length && writable);
@@ -3822,7 +3904,7 @@
this.list_contacts = function(src, group, page)
{
- var add_url = '',
+ var folder, add_url = '',
target = window;
if (!src)
@@ -3838,7 +3920,12 @@
else if (group != this.env.group)
page = this.env.current_page = 1;
- this.select_folder((group ? 'G'+src+group : src), (this.env.group ? 'G'+this.env.source+this.env.group : this.env.source));
+ if (this.env.search_id)
+ folder = 'S'+this.env.search_id;
+ else
+ folder = group ? 'G'+src+group : src;
+
+ this.select_folder(folder);
this.env.source = src;
this.env.group = group;
@@ -3883,8 +3970,8 @@
if (group)
url += '&_gid='+group;
- // also send search request to get the right messages
- if (this.env.search_request)
+ // also send search request to get the right messages
+ if (this.env.search_request)
url += '&_search='+this.env.search_request;
this.http_request('list', url, lock);
@@ -3894,7 +3981,8 @@
{
this.contact_list.clear(true);
this.show_contentframe(false);
- this.enable_command('delete', 'compose', false);
+ this.enable_command('delete', false);
+ this.enable_command('compose', this.env.group ? true : false);
};
// load contact record
@@ -3966,9 +4054,11 @@
this.delete_contacts = function()
{
+ var selection = this.contact_list.get_selection(),
+ undelete = this.env.address_sources[this.env.source].undelete;
+
// exit if no mailbox specified or if selection is empty
- var selection = this.contact_list.get_selection();
- if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
+ if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
return;
var id, n, a_cids = [], qs = '';
@@ -3995,7 +4085,10 @@
qs += '&_search='+this.env.search_request;
// send request to server
- this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+ this.http_post('delete', '_cid='+urlencode(a_cids.join(','))
+ +'&_source='+urlencode(this.env.source)
+ +'&_from='+(this.env.action ? this.env.action : '')+qs,
+ this.display_message(this.get_label('contactdeleting'), 'loading'));
return true;
};
@@ -4005,7 +4098,7 @@
{
var c, row, list = this.contact_list;
- cid = String(cid).replace(this.identifier_expr, '_');
+ cid = this.html_identifier(cid);
// when in searching mode, concat cid with the source name
if (!list.rows[cid]) {
@@ -4021,7 +4114,7 @@
// cid change
if (newcid) {
- newcid = String(newcid).replace(this.identifier_expr, '_');
+ newcid = this.html_identifier(newcid);
row.id = 'rcmrow' + newcid;
list.remove_row(cid);
list.init_row(row);
@@ -4034,31 +4127,29 @@
// add row to contacts list
this.add_contact_row = function(cid, cols, select)
{
- if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
+ if (!this.gui_objects.contactslist)
return false;
- var tbody = this.gui_objects.contactslist.tBodies[0],
- rowcount = tbody.rows.length,
- even = rowcount%2,
+ var c, list = this.contact_list,
row = document.createElement('tr');
- row.id = 'rcmrow'+String(cid).replace(this.identifier_expr, '_');
- row.className = 'contact '+(even ? 'even' : 'odd');
+ row.id = 'rcmrow'+this.html_identifier(cid);
+ row.className = 'contact';
- if (this.contact_list.in_selection(cid))
+ if (list.in_selection(cid))
row.className += ' selected';
// add each submitted col
- for (var c in cols) {
+ for (c in cols) {
col = document.createElement('td');
col.className = String(c).toLowerCase();
col.innerHTML = cols[c];
row.appendChild(col);
}
- this.contact_list.insert_row(row);
+ list.insert_row(row);
- this.enable_command('export', (this.contact_list.rowcount > 0));
+ this.enable_command('export', list.rowcount > 0);
};
this.init_contact_form = function()
@@ -4080,24 +4171,27 @@
this.selectedIndex = 0;
});
+ // enable date pickers on date fields
+ if ($.datepicker && this.env.date_format) {
+ $.datepicker.setDefaults({
+ dateFormat: this.env.date_format,
+ changeMonth: true,
+ changeYear: true,
+ yearRange: '-100:+10',
+ showOtherMonths: true,
+ selectOtherMonths: true,
+ monthNamesShort: this.env.month_names,
+ onSelect: function(dateText) { $(this).focus().val(dateText) }
+ });
+ $('input.datepicker').datepicker();
+ }
+
$("input[type='text']:visible").first().focus();
};
this.group_create = function()
{
- if (!this.gui_objects.folderlist)
- return;
-
- if (!this.name_input) {
- this.name_input = $('<input>').attr('type', 'text');
- this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
- this.name_input_li = $('<li>').addClass('contactgroup').append(this.name_input);
-
- var li = this.get_folder_li(this.env.source)
- this.name_input_li.insertAfter(li);
- }
-
- this.name_input.select().focus();
+ this.add_input_row('contactgroup');
};
this.group_rename = function()
@@ -4143,18 +4237,40 @@
this.list_contacts(prop.source, 0);
};
+ // @TODO: maybe it would be better to use popup instead of inserting input to the list?
+ this.add_input_row = function(type)
+ {
+ if (!this.gui_objects.folderlist)
+ return;
+
+ if (!this.name_input) {
+ this.name_input = $('<input>').attr('type', 'text').data('tt', type);
+ this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
+ this.name_input_li = $('<li>').addClass(type).append(this.name_input);
+
+ var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : this.get_folder_li(this.env.source);
+ this.name_input_li.insertAfter(li);
+ }
+
+ this.name_input.select().focus();
+ };
+
// handler for keyboard events on the input field
this.add_input_keydown = function(e)
{
- var key = rcube_event.get_keycode(e);
+ var key = rcube_event.get_keycode(e),
+ input = $(e.target), itype = input.data('tt');
// enter
if (key == 13) {
- var newname = this.name_input.val();
+ var newname = input.val();
if (newname) {
var lock = this.set_busy(true, 'loading');
- if (this.env.group_renaming)
+
+ if (itype == 'contactsearch')
+ this.http_post('search-create', '_search='+urlencode(this.env.search_request)+'&_name='+urlencode(newname), lock);
+ else if (this.env.group_renaming)
this.http_post('group-rename', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_name='+urlencode(newname), lock);
else
this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), lock);
@@ -4199,7 +4315,7 @@
.attr('rel', prop.source+':'+prop.id)
.click(function() { return rcmail.command('listgroup', prop, this); })
.html(prop.name),
- li = $('<li>').attr({id: 'rcmli'+key.replace(this.identifier_expr, '_'), 'class': 'contactgroup'})
+ li = $('<li>').attr({id: 'rcmli'+this.html_identifier(key), 'class': 'contactgroup'})
.append(link);
this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
@@ -4222,7 +4338,7 @@
var newkey = 'G'+prop.source+prop.newid,
newprop = $.extend({}, prop);;
- li.id = String('rcmli'+newkey).replace(this.identifier_expr, '_');
+ li.id = 'rcmli' + this.html_identifier(newkey);
this.env.contactfolders[newkey] = this.env.contactfolders[key];
this.env.contactfolders[newkey].id = prop.newid;
this.env.group = prop.newid;
@@ -4254,7 +4370,7 @@
{
var row, name = prop.name.toUpperCase(),
sibling = this.get_folder_li(prop.source),
- prefix = 'rcmliG'+(prop.source).replace(this.identifier_expr, '_');
+ prefix = 'rcmliG' + this.html_identifier(prop.source);
// When renaming groups, we need to remove it from DOM and insert it in the proper place
if (reloc) {
@@ -4288,7 +4404,7 @@
elem.focus(function(){ ref.focus_textfield(this); })
.blur(function(){ ref.blur_textfield(this); })
- .each(function(){ this._placeholder = this.title = ref.env.coltypes[col].label; ref.blur_textfield(this); });
+ .each(function(){ this._placeholder = this.title = (ref.env.coltypes[col].label || ''); ref.blur_textfield(this); });
};
this.insert_edit_field = function(col, section, menu)
@@ -4325,6 +4441,9 @@
.appendTo(cell);
this.init_edit_field(col, input);
+
+ if (colprop.type == 'date' && $.datepicker)
+ input.datepicker();
}
else if (colprop.type == 'composite') {
var childcol, cp, first, templ, cols = [], suffices = [];
@@ -4470,11 +4589,106 @@
// unselect directory/group
this.unselect_directory = function()
{
- if (this.env.address_sources.length > 1 || this.env.group != '') {
- this.select_folder('', (this.env.group ? 'G'+this.env.source+this.env.group : this.env.source));
- this.env.group = '';
- this.env.source = '';
+ this.select_folder('');
+ this.enable_command('search-delete', false);
+ };
+
+ // callback for creating a new saved search record
+ this.insert_saved_search = function(name, id)
+ {
+ this.reset_add_input();
+
+ var key = 'S'+id,
+ link = $('<a>').attr('href', '#')
+ .attr('rel', id)
+ .click(function() { return rcmail.command('listsearch', id, this); })
+ .html(name),
+ li = $('<li>').attr({id: 'rcmli' + this.html_identifier(key), 'class': 'contactsearch'})
+ .append(link),
+ prop = {name:name, id:id, li:li[0]};
+
+ this.add_saved_search_row(prop, li);
+ this.select_folder('S'+id);
+ this.enable_command('search-delete', true);
+ this.env.search_id = id;
+
+ this.triggerEvent('abook_search_insert', prop);
+ };
+
+ // add saved search row to the list, with sorting
+ this.add_saved_search_row = function(prop, li, reloc)
+ {
+ var row, sibling, name = prop.name.toUpperCase();
+
+ // When renaming groups, we need to remove it from DOM and insert it in the proper place
+ if (reloc) {
+ row = li.clone(true);
+ li.remove();
}
+ else
+ row = li;
+
+ $('li[class~="contactsearch"]', this.gui_objects.folderlist).each(function(i, elem) {
+ if (!sibling)
+ sibling = this.previousSibling;
+
+ if (name >= $(this).text().toUpperCase())
+ sibling = elem;
+ else
+ return false;
+ });
+
+ if (sibling)
+ row.insertAfter(sibling);
+ else
+ row.appendTo(this.gui_objects.folderlist);
+ };
+
+ // creates an input for saved search name
+ this.search_create = function()
+ {
+ this.add_input_row('contactsearch');
+ };
+
+ this.search_delete = function()
+ {
+ if (this.env.search_request) {
+ var lock = this.set_busy(true, 'savedsearchdeleting');
+ this.http_post('search-delete', '_sid='+urlencode(this.env.search_id), lock);
+ }
+ };
+
+ // callback from server upon search-delete command
+ this.remove_search_item = function(id)
+ {
+ var li, key = 'S'+id;
+ if ((li = this.get_folder_li(key))) {
+ this.triggerEvent('search_delete', { id:id, li:li });
+
+ li.parentNode.removeChild(li);
+ }
+
+ this.env.search_id = null;
+ this.env.search_request = null;
+ this.list_contacts_clear();
+ this.reset_qsearch();
+ this.enable_command('search-delete', 'search-create', false);
+ };
+
+ this.listsearch = function(id)
+ {
+ var folder, lock = this.set_busy(true, 'searching');
+
+ if (this.contact_list) {
+ this.list_contacts_clear();
+ }
+
+ this.reset_qsearch();
+ this.select_folder('S'+id);
+
+ // reset vars
+ this.env.current_page = 1;
+ this.http_request('search', '_sid='+urlencode(id), lock);
};
@@ -4914,6 +5128,34 @@
/********* GUI functionality *********/
/*********************************************************/
+ var init_button = function(cmd, prop)
+ {
+ var elm = document.getElementById(prop.id);
+ if (!elm)
+ return;
+
+ var preload = false;
+ if (prop.type == 'image') {
+ elm = elm.parentNode;
+ preload = true;
+ }
+
+ elm._command = cmd;
+ elm._id = prop.id;
+ if (prop.sel) {
+ elm.onmousedown = function(e){ return rcmail.button_sel(this._command, this._id); };
+ elm.onmouseup = function(e){ return rcmail.button_out(this._command, this._id); };
+ if (preload)
+ new Image().src = prop.sel;
+ }
+ if (prop.over) {
+ elm.onmouseover = function(e){ return rcmail.button_over(this._command, this._id); };
+ elm.onmouseout = function(e){ return rcmail.button_out(this._command, this._id); };
+ if (preload)
+ new Image().src = prop.over;
+ }
+ };
+
// enable/disable buttons for page shifting
this.set_page_buttons = function()
{
@@ -4929,44 +5171,21 @@
continue;
for (var i=0; i< this.buttons[cmd].length; i++) {
- var prop = this.buttons[cmd][i];
- var elm = document.getElementById(prop.id);
- if (!elm)
- continue;
-
- var preload = false;
- if (prop.type == 'image') {
- elm = elm.parentNode;
- preload = true;
- }
-
- elm._command = cmd;
- elm._id = prop.id;
- if (prop.sel) {
- elm.onmousedown = function(e){ return rcmail.button_sel(this._command, this._id); };
- elm.onmouseup = function(e){ return rcmail.button_out(this._command, this._id); };
- if (preload)
- new Image().src = prop.sel;
- }
- if (prop.over) {
- elm.onmouseover = function(e){ return rcmail.button_over(this._command, this._id); };
- elm.onmouseout = function(e){ return rcmail.button_out(this._command, this._id); };
- if (preload)
- new Image().src = prop.over;
- }
+ init_button(cmd, this.buttons[cmd][i]);
}
}
+
+ // set active task button
+ this.set_button(this.task, 'sel');
};
// set button to a specific state
this.set_button = function(command, state)
{
- var button, obj, a_buttons = this.buttons[command];
+ var n, button, obj, a_buttons = this.buttons[command],
+ len = a_buttons ? a_buttons.length : 0;
- if (!a_buttons || !a_buttons.length)
- return false;
-
- for (var n=0; n<a_buttons.length; n++) {
+ for (n=0; n<len; n++) {
button = a_buttons[n];
obj = document.getElementById(button.id);
@@ -5001,15 +5220,14 @@
// display a specific alttext
this.set_alttext = function(command, label)
{
- if (!this.buttons[command] || !this.buttons[command].length)
- return;
+ var n, button, obj, link, a_buttons = this.buttons[command],
+ len = a_buttons ? a_buttons.length : 0;
- var button, obj, link;
- for (var n=0; n<this.buttons[command].length; n++) {
- button = this.buttons[command][n];
+ for (n=0; n<len; n++) {
+ button = a_buttons[n];
obj = document.getElementById(button.id);
- if (button.type=='image' && obj) {
+ if (button.type == 'image' && obj) {
obj.setAttribute('alt', this.get_label(label));
if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
link.setAttribute('title', this.get_label(label));
@@ -5022,20 +5240,18 @@
// mouse over button
this.button_over = function(command, id)
{
- var button, elm, a_buttons = this.buttons[command];
+ var n, button, obj, a_buttons = this.buttons[command],
+ len = a_buttons ? a_buttons.length : 0;
- if (!a_buttons || !a_buttons.length)
- return false;
-
- for (var n=0; n<a_buttons.length; n++) {
+ for (n=0; n<len; n++) {
button = a_buttons[n];
if (button.id == id && button.status == 'act') {
- elm = document.getElementById(button.id);
- if (elm && button.over) {
+ obj = document.getElementById(button.id);
+ if (obj && button.over) {
if (button.type == 'image')
- elm.src = button.over;
+ obj.src = button.over;
else
- elm.className = button.over;
+ obj.className = button.over;
}
}
}
@@ -5044,20 +5260,18 @@
// mouse down on button
this.button_sel = function(command, id)
{
- var button, elm, a_buttons = this.buttons[command];
+ var n, button, obj, a_buttons = this.buttons[command],
+ len = a_buttons ? a_buttons.length : 0;
- if (!a_buttons || !a_buttons.length)
- return;
-
- for (var n=0; n<a_buttons.length; n++) {
+ for (n=0; n<len; n++) {
button = a_buttons[n];
if (button.id == id && button.status == 'act') {
- elm = document.getElementById(button.id);
- if (elm && button.sel) {
+ obj = document.getElementById(button.id);
+ if (obj && button.sel) {
if (button.type == 'image')
- elm.src = button.sel;
+ obj.src = button.sel;
else
- elm.className = button.sel;
+ obj.className = button.sel;
}
this.buttons_sel[id] = command;
}
@@ -5067,25 +5281,22 @@
// mouse out of button
this.button_out = function(command, id)
{
- var button, elm, a_buttons = this.buttons[command];
+ var n, button, obj, a_buttons = this.buttons[command],
+ len = a_buttons ? a_buttons.length : 0;
- if (!a_buttons || !a_buttons.length)
- return;
-
- for (var n=0; n<a_buttons.length; n++) {
+ for (n=0; n<len; n++) {
button = a_buttons[n];
if (button.id == id && button.status == 'act') {
- elm = document.getElementById(button.id);
- if (elm && button.act) {
+ obj = document.getElementById(button.id);
+ if (obj && button.act) {
if (button.type == 'image')
- elm.src = button.act;
+ obj.src = button.act;
else
- elm.className = button.act;
+ obj.className = button.act;
}
}
}
};
-
this.focus_textfield = function(elem)
{
@@ -5120,14 +5331,14 @@
if (!this.gui_objects.message) {
// save message in order to display after page loaded
if (type != 'loading')
- this.pending_message = new Array(msg, type, timeout);
+ this.pending_message = [msg, type, timeout];
return false;
}
type = type ? type : 'notice';
var ref = this,
- key = String(msg).replace(this.identifier_expr, '_'),
+ key = this.html_identifier(msg),
date = new Date(),
id = type + date.getTime();
@@ -5220,31 +5431,31 @@
};
// mark a mailbox as selected and set environment variable
- this.select_folder = function(name, old, prefix)
+ this.select_folder = function(name, prefix, encode)
{
if (this.gui_objects.folderlist) {
var current_li, target_li;
- if ((current_li = this.get_folder_li(old, prefix))) {
- $(current_li).removeClass('selected').addClass('unfocused');
+ if ((current_li = $('li.selected', this.gui_objects.folderlist))) {
+ current_li.removeClass('selected').addClass('unfocused');
}
- if ((target_li = this.get_folder_li(name, prefix))) {
+ if ((target_li = this.get_folder_li(name, prefix, encode))) {
$(target_li).removeClass('unfocused').addClass('selected');
}
// trigger event hook
- this.triggerEvent('selectfolder', { folder:name, old:old, prefix:prefix });
+ this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
}
};
// helper method to find a folder list item
- this.get_folder_li = function(name, prefix)
+ this.get_folder_li = function(name, prefix, encode)
{
if (!prefix)
prefix = 'rcmli';
if (this.gui_objects.folderlist) {
- name = String(name).replace(this.identifier_expr, '_');
+ name = this.html_identifier(name, encode);
return document.getElementById(prefix+name);
}
@@ -5313,8 +5524,12 @@
};
// replace content of row count display
- this.set_rowcount = function(text)
+ this.set_rowcount = function(text, mbox)
{
+ // #1487752
+ if (mbox && mbox != this.env.mailbox)
+ return false;
+
$(this.gui_objects.countdisplay).html(text);
// update page navigation buttons
@@ -5354,7 +5569,7 @@
{
var reg, link, text_obj, item, mycount, childcount, div;
- if (item = this.get_folder_li(mbox)) {
+ if (item = this.get_folder_li(mbox, '', true)) {
mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
link = $(item).children('a').eq(0);
text_obj = link.children('span.unreadcount');
@@ -5366,7 +5581,7 @@
if ((div = item.getElementsByTagName('div')[0]) &&
div.className.match(/collapsed/)) {
// add children's counters
- for (var k in this.env.unread_counts)
+ for (var k in this.env.unread_counts)
if (k.indexOf(mbox + this.env.delimiter) == 0)
childcount += this.env.unread_counts[k];
}
@@ -5407,16 +5622,12 @@
this.toggle_prefer_html = function(checkbox)
{
- var elem;
- if (elem = document.getElementById('rcmfd_addrbook_show_images'))
- elem.disabled = !checkbox.checked;
+ $('#rcmfd_show_images').prop('disabled', !checkbox.checked).val(0);
};
this.toggle_preview_pane = function(checkbox)
{
- var elem;
- if (elem = document.getElementById('rcmfd_preview_pane_mark_read'))
- elem.disabled = !checkbox.checked;
+ $('#rcmfd_preview_pane_mark_read').prop('disabled', !checkbox.checked);
};
// display fetched raw headers
@@ -5532,14 +5743,14 @@
$.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
error: function(o, status, err) { rcmail.http_error(o, status, err, lock); },
- success: function(data) { rcmail.set_busy(false, null, lock); $(document.getElementById(id)).val(data); rcmail.log(data); }
+ success: function(data) { rcmail.set_busy(false, null, lock); $('#'+id).val(data); rcmail.log(data); }
});
};
this.plain2html = function(plainText, id)
{
var lock = this.set_busy(true, 'converting');
- $(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
+ $('#'+id).val(plainText ? '<pre>'+plainText+'</pre>' : '');
this.set_busy(false, null, lock);
};
@@ -5566,7 +5777,7 @@
var base = this.env.comm_path;
// overwrite task name
- if (query._action.match(/([a-z]+)\/([a-z-_]+)/)) {
+ if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
query._action = RegExp.$2;
base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
}
@@ -5780,6 +5991,8 @@
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
if (response.action == 'list' || response.action == 'search') {
+ this.enable_command('search-create', this.env.source == '');
+ this.enable_command('search-delete', this.env.search_id);
this.update_group_commands();
this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
}
@@ -5994,6 +6207,23 @@
}
};
+rcube_webmail.long_subject_title_ie = function(elem, indent)
+{
+ if (!elem.title) {
+ var $elem = $(elem),
+ txt = $.trim($elem.text()),
+ tmp = $('<span>').text(txt)
+ .css({'position': 'absolute', 'float': 'left', 'visibility': 'hidden',
+ 'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
+ .appendTo($('body')),
+ w = tmp.width();
+
+ tmp.remove();
+ if (w + indent * 15 > $elem.width())
+ elem.title = txt;
+ }
+};
+
// copy event engine prototype
rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
--
Gitblit v1.9.1