From 8e3a6039cfefb8f351d2696ebdcfa26cc5d4cef9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 13 Apr 2010 03:24:09 -0400
Subject: [PATCH] Assign newly created contacts to the active group (#1486626) and fix group selection display (#1486619)
---
program/js/app.js | 570 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 427 insertions(+), 143 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 7aca3d8..8b5460a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -197,7 +197,7 @@
if (this.env.action=='show' || this.env.action=='preview')
{
- this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete',
+ this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', true);
if (this.env.next_uid)
@@ -284,9 +284,13 @@
case 'addressbook':
+ if (this.gui_objects.folderlist)
+ this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
+
if (this.gui_objects.contactslist)
{
- this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:true, keyboard:true});
+ 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 }); };
this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
@@ -306,13 +310,15 @@
else
this.contact_list.focus();
- this.gui_objects.folderlist = this.gui_objects.contactslist;
+ //this.gui_objects.folderlist = this.gui_objects.contactslist;
}
this.set_page_buttons();
- if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly)
+ if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly) {
this.enable_command('add', 'import', true);
+ this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
+ }
if (this.env.cid)
this.enable_command('show', 'edit', true);
@@ -325,7 +331,7 @@
if (this.contact_list && this.contact_list.rowcount > 0)
this.enable_command('export', true);
- this.enable_command('list', true);
+ this.enable_command('list', 'listgroup', true);
break;
@@ -358,7 +364,6 @@
this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
this.sections_list.init();
this.sections_list.focus();
- this.sections_list.select_first();
}
else if (this.gui_objects.subscriptionlist)
this.init_subscription_list();
@@ -490,9 +495,8 @@
case 'menu-open':
case 'menu-save':
- this.triggerEvent(command, {props:props});
- return false;
- break;
+ this.triggerEvent(command, {props:props});
+ return false;
case 'open':
var uid;
@@ -521,8 +525,13 @@
this.reset_qsearch();
this.list_contacts(props);
- this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[props].readonly));
+ this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
}
+ break;
+
+
+ case 'listgroup':
+ this.list_contacts(null, props);
break;
@@ -674,6 +683,11 @@
this.copy_contact(null, props);
break;
+ case 'copy':
+ if (this.task == 'mail')
+ this.copy_messages(props);
+ break;
+
case 'mark':
if (props)
this.mark_message(props);
@@ -749,10 +763,11 @@
break;
case 'select-all':
+ this.select_all_mode = props ? false : true;
if (props == 'invert')
this.message_list.invert_selection();
else
- this.message_list.select_all(props);
+ this.message_list.select_all(props == 'page' ? '' : props);
break;
case 'select-none':
@@ -964,7 +979,7 @@
case 'add-contact':
this.add_contact(props);
break;
-
+
// quicksearch
case 'search':
if (!props && this.gui_objects.qsearchbox)
@@ -983,7 +998,19 @@
if (s && this.env.mailbox)
this.list_mailbox(this.env.mailbox);
else if (s && this.task == 'addressbook')
- this.list_contacts(this.env.source);
+ this.list_contacts(this.env.source, this.env.group);
+ break;
+
+ case 'group-create':
+ this.add_contact_group(props)
+ break;
+
+ case 'group-rename':
+ this.rename_contact_group();
+ break;
+
+ case 'group-delete':
+ this.delete_contact_group();
break;
case 'import':
@@ -1186,7 +1213,7 @@
if (!rcube_mouse_is_over(e, this.contact_list.list))
this.contact_list.blur();
list = this.contact_list;
- model = this.env.address_sources;
+ model = this.env.contactfolders;
}
else if (this.ksearch_value) {
this.ksearch_blur();
@@ -1194,10 +1221,14 @@
// handle mouse release when dragging
if (this.drag_active && model && this.env.last_folder_target) {
+ var target = model[this.env.last_folder_target];
+
$(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
- this.command('moveto', model[this.env.last_folder_target].id);
this.env.last_folder_target = null;
list.draglayer.hide();
+
+ if (!this.drag_menu(e, target))
+ this.command('moveto', target);
}
// reset 'pressed' buttons
@@ -1209,14 +1240,42 @@
}
};
+ this.drag_menu = function(e, target)
+ {
+ var modkey = rcube_event.get_modifier(e);
+ var 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();
+ return true;
+ }
+
+ return false;
+ };
+
+ this.drag_menu_action = function(action)
+ {
+ var menu = $('#'+this.gui_objects.message_dragmenu);
+ if (menu) {
+ menu.hide();
+ }
+ this.command(action, this.env.drag_target);
+ this.env.drag_target = null;
+ };
+
this.drag_start = function(list)
{
- var model = this.task == 'mail' ? this.env.mailboxes : this.env.address_sources;
+ var model = this.task == 'mail' ? this.env.mailboxes : this.env.contactfolders;
this.drag_active = true;
if (this.preview_timer)
clearTimeout(this.preview_timer);
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
+
// save folderlist and folders location/sizes for droptarget calculation in drag_move()
if (this.gui_objects.folderlist && model)
{
@@ -1382,6 +1441,9 @@
if (this.preview_timer)
clearTimeout(this.preview_timer);
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
+
var selected = list.get_single_selection() != null;
// Hide certain command buttons when Drafts folder is selected
@@ -1389,12 +1451,12 @@
{
this.enable_command('reply', 'reply-all', 'forward', false);
this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected);
- this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
+ this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
}
else
{
this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected);
- this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
+ this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
}
// start timer for message preview (wait for double click)
@@ -1408,6 +1470,9 @@
{
if (this.preview_timer)
clearTimeout(this.preview_timer);
+
+ if (this.preview_read_timer)
+ clearTimeout(this.preview_read_timer);
var uid = list.get_single_selection();
if (uid && this.env.mailbox == this.env.drafts_mailbox)
@@ -1424,6 +1489,10 @@
this.command('delete');
else if (list.key_pressed == list.BACKSPACE_KEY)
this.command('delete');
+ else if (list.key_pressed == 33)
+ this.command('previouspage');
+ else if (list.key_pressed == 34)
+ this.command('nextpage');
else
list.shiftkey = false;
};
@@ -1448,7 +1517,9 @@
if (this.task == 'mail')
return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'addressbook')
- return (id != this.env.source && this.env.address_sources[id] && !this.env.address_sources[id].readonly);
+ return (id != this.env.source && this.env.contactfolders[id] && !this.env.contactfolders[id].readonly &&
+ !(!this.env.source && this.env.contactfolders[id].group) &&
+ !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].id == this.env.group));
else if (this.task == 'settings')
return (id != this.env.folder);
};
@@ -1496,14 +1567,14 @@
var tbody = this.message_list.background;
else
var tbody = this.gui_objects.messagelist.tBodies[0];
-
+
var rows = this.message_list.rows;
var rowcount = tbody.rows.length;
var even = rowcount%2;
-
+
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,
@@ -1524,35 +1595,33 @@
+ (flags.unread ? ' unread' : '')
+ (flags.deleted ? ' deleted' : '')
+ (flags.flagged ? ' flagged' : '')
- + (flags.unread_children && !flags.unread ? ' unroot' : '')
+ + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+ (this.message_list.in_selection(uid) ? ' selected' : '');
// for performance use DOM instead of jQuery here
var row = document.createElement('tr');
row.id = 'rcmrow'+uid;
row.className = css_class;
-
+
var icon = this.env.messageicon;
if (!flags.unread && flags.unread_children > 0 && this.env.unreadchildrenicon)
icon = this.env.unreadchildrenicon;
else if (flags.deleted && this.env.deletedicon)
icon = this.env.deletedicon;
- else if (flags.replied && this.env.repliedicon)
- {
+ else if (flags.replied && this.env.repliedicon) {
if (flags.forwarded && this.env.forwardedrepliedicon)
icon = this.env.forwardedrepliedicon;
else
icon = this.env.repliedicon;
- }
+ }
else if (flags.forwarded && this.env.forwardedicon)
icon = this.env.forwardedicon;
else if(flags.unread && this.env.unreadicon)
icon = this.env.unreadicon;
-
+
var tree = expando = '';
- if (this.env.threading)
- {
+ if (this.env.threading) {
// This assumes that div width is hardcoded to 15px,
var width = message.depth * 15;
if (message.depth) {
@@ -1563,7 +1632,7 @@
}
else
message.expanded = true;
- }
+ }
else if (message.has_children) {
if (typeof(message.expanded) == 'undefined' && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
message.expanded = true;
@@ -1575,7 +1644,7 @@
if (message.has_children && !message.depth)
expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '"> </div>';
- }
+ }
tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : '';
@@ -1694,24 +1763,25 @@
var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
this.show_contentframe(true);
- else
- {
+ else {
this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+url;
// mark as read and change mbox unread counter
- if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
- {
- this.set_message(id, 'unread', false);
- this.update_thread_root(id, 'read');
- if (this.env.unread_counts[this.env.mailbox])
- {
- this.env.unread_counts[this.env.mailbox] -= 1;
- this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
+ if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
+ this.preview_read_timer = window.setTimeout(function() {
+ ref.set_message(id, 'unread', false);
+ ref.update_thread_root(id, 'read');
+ if (ref.env.unread_counts[ref.env.mailbox]) {
+ ref.env.unread_counts[ref.env.mailbox] -= 1;
+ ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
}
- }
+ if (ref.env.preview_pane_mark_read > 0)
+ ref.http_post('mark', '_uid='+id+'&_flag=read');
+ }, this.env.preview_pane_mark_read * 1000);
}
- };
+ }
+ };
this.show_contentframe = function(show)
{
@@ -1750,7 +1820,7 @@
if (this.task=='mail')
this.list_mailbox(this.env.mailbox, page);
else if (this.task=='addressbook')
- this.list_contacts(this.env.source, page);
+ this.list_contacts(this.env.source, null, page);
}
};
@@ -1804,9 +1874,10 @@
// unselect selected messages
this.last_selected = 0;
- if (this.message_list)
+ if (this.message_list) {
this.message_list.clear_selection();
-
+ this.select_all_mode = false;
+ }
this.select_folder(mbox, this.env.mailbox);
this.env.mailbox = mbox;
@@ -1896,7 +1967,7 @@
if (!this.env.threading)
return;
- var root = this.find_thread_root(uid);
+ var root = this.message_list.find_root(uid);
if (uid == root)
return;
@@ -1916,17 +1987,6 @@
this.set_unread_children(root);
};
- // finds root message for specified thread
- this.find_thread_root = function(uid)
- {
- var r = this.message_list.rows[uid];
-
- if (r.parent_uid)
- return this.find_thread_root(r.parent_uid);
- else
- return uid;
- }
-
// update thread indicators for all messages in a thread below the specified message
// return number of removed/added root level messages
this.update_thread = function (uid)
@@ -1944,7 +2004,7 @@
count--;
else if (row.unread) {
// update unread_children for thread root
- var parent = this.find_thread_root(uid);
+ var parent = this.message_list.find_root(uid);
rows[parent].unread_children--;
this.set_unread_children(parent);
}
@@ -2121,9 +2181,38 @@
$(row.obj).removeClass('unroot');
};
+ // copy selected messages to the specified mailbox
+ this.copy_messages = function(mbox)
+ {
+ // 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)))
+ return;
+
+ var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+ var a_uids = new Array();
+
+ if (this.env.uid)
+ a_uids[0] = this.env.uid;
+ else
+ {
+ var selection = this.message_list.get_selection();
+ var id;
+ for (var n=0; n<selection.length; n++) {
+ id = selection[n];
+ a_uids[a_uids.length] = id;
+ }
+ }
+
+ // send request to server
+ this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, false);
+ };
+
// move selected messages to the specified mailbox
this.move_messages = function(mbox)
{
+ 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)))
return;
@@ -2148,32 +2237,38 @@
// delete selected messages from the current mailbox
this.delete_messages = function()
- {
- var selection = this.message_list ? this.message_list.get_selection() : new Array();
+ {
+ var selection = this.message_list ? $.merge([], this.message_list.get_selection()) : new Array();
// exit if no mailbox specified or if selection is empty
if (!this.env.uid && !selection.length)
return;
-
+
+ // also select childs of collapsed rows
+ for (var uid, i=0; i < selection.length; i++) {
+ uid = selection[i];
+ if (this.message_list.rows[uid].has_children && !this.message_list.rows[uid].expanded)
+ this.message_list.select_childs(uid);
+ }
+
// if config is set to flag for deletion
if (this.env.flag_for_deletion) {
this.mark_message('delete');
return false;
- }
+ }
// if there isn't a defined trash mailbox or we are in it
else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox)
this.permanently_remove_messages();
// if there is a trash mailbox defined and we're not currently in it
else {
// if shift was pressed delete it immediately
- if (this.message_list && this.message_list.shiftkey)
- {
+ if (this.message_list && this.message_list.shiftkey) {
if (confirm(this.get_label('deletemessagesconfirm')))
this.permanently_remove_messages();
- }
+ }
else
this.move_messages(this.env.trash_mailbox);
- }
+ }
return true;
};
@@ -2193,8 +2288,8 @@
// @private
this._with_selected_messages = function(action, lock, add_url)
{
- var a_uids = new Array();
- var count = 0;
+ var a_uids = new Array(),
+ count = 0;
if (this.env.uid)
a_uids[0] = this.env.uid;
@@ -2205,7 +2300,7 @@
for (var n=0; n<selection.length; n++) {
id = selection[n];
a_uids[a_uids.length] = id;
- count += this.update_thread(id);
+ count += this.update_thread(id);
this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
}
// make sure there are no selected rows
@@ -2226,16 +2321,18 @@
// remove threads from the end of the list
this.delete_excessive_thread_rows();
+ add_url += '&_uid='+this.uids_to_list(a_uids);
+
// send request to server
- this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+ this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
};
// set a specific flag to one or more messages
this.mark_message = function(flag, uid)
{
- var a_uids = new Array();
- var r_uids = new Array();
- var selection = this.message_list ? this.message_list.get_selection() : new Array();
+ var a_uids = new Array(),
+ r_uids = new Array(),
+ selection = this.message_list ? this.message_list.get_selection() : new Array();
if (uid)
a_uids[0] = uid;
@@ -2267,7 +2364,7 @@
}
// nothing to do
- if (!r_uids.length)
+ if (!r_uids.length && !this.select_all_mode)
return;
switch (flag)
@@ -2294,7 +2391,7 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
for (var i=0; i<a_uids.length; i++)
this.update_thread_root(a_uids[i], flag);
@@ -2307,7 +2404,7 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
};
// mark all message rows as deleted/undeleted
@@ -2326,15 +2423,12 @@
}
var all_deleted = true;
- for (var i=0; i<a_uids.length; i++)
+ for (var uid, i=0; i<a_uids.length; i++)
{
uid = a_uids[i];
- if (rows[uid]) {
- if (!rows[uid].deleted)
- {
- all_deleted = false;
- break;
- }
+ if (rows[uid] && !rows[uid].deleted) {
+ all_deleted = false;
+ break;
}
}
@@ -2351,49 +2445,48 @@
for (var i=0; i<a_uids.length; i++)
this.set_message(a_uids[i], 'deleted', false);
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+ this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete');
return true;
};
this.flag_as_deleted = function(a_uids)
{
- var add_url = '';
- var r_uids = new Array();
- var rows = this.message_list ? this.message_list.rows : new Array();
- var count = 0;
+ var add_url = '',
+ r_uids = new Array(),
+ rows = this.message_list ? this.message_list.rows : new Array(),
+ count = 0;
- for (var i=0; i<a_uids.length; i++)
- {
+ for (var i=0; i<a_uids.length; i++) {
uid = a_uids[i];
- if (rows[uid])
- {
+ if (rows[uid]) {
if (rows[uid].unread)
r_uids[r_uids.length] = uid;
- if (this.env.skip_deleted) {
- count += this.update_thread(uid);
+ if (this.env.skip_deleted) {
+ count += this.update_thread(uid);
this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
- }
- else
- this.set_message(uid, 'deleted', true);
- }
+ }
+ else
+ this.set_message(uid, 'deleted', true);
}
+ }
// make sure there are no selected rows
if (this.env.skip_deleted && this.message_list) {
if(!this.env.display_next)
- this.message_list.clear_selection();
+ this.message_list.clear_selection();
if (count < 0)
add_url += '&_count='+(count*-1);
else if (count > 0)
// remove threads from the end of the list
this.delete_excessive_thread_rows();
- }
+ }
add_url = '&_from='+(this.env.action ? this.env.action : '');
+ // ??
if (r_uids.length)
- add_url += '&_ruid='+r_uids.join(',');
+ add_url += '&_ruid='+this.uids_to_list(r_uids);
if (this.env.skip_deleted) {
// also send search request to get the right messages
@@ -2403,7 +2496,7 @@
add_url += '&_next_uid='+this.env.next_uid;
}
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
+ this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);
return true;
};
@@ -2411,21 +2504,25 @@
// argument should be a coma-separated list of uids
this.flag_deleted_as_read = function(uids)
{
- var icn_src;
- var rows = this.message_list ? this.message_list.rows : new Array();
- var str = String(uids);
- var a_uids = new Array();
+ var icn_src, uid,
+ rows = this.message_list ? this.message_list.rows : new Array(),
+ str = String(uids),
+ a_uids = str.split(',');
- a_uids = str.split(',');
-
- for (var uid, i=0; i<a_uids.length; i++)
- {
+ for (var i=0; i<a_uids.length; i++) {
uid = a_uids[i];
if (rows[uid])
this.set_message(uid, 'unread', false);
}
};
+ // Converts array of message UIDs to comma-separated list for use in URL
+ // with select_all mode checking
+ this.uids_to_list = function(uids)
+ {
+ return this.select_all_mode ? '*' : uids.join(',');
+ };
+
/*********************************************************/
/********* mailbox folders methods *********/
@@ -2832,7 +2929,7 @@
{
if (!this.gui_objects.uploadbox)
return false;
-
+
var elm, list;
if (elm = this.gui_objects.uploadbox)
{
@@ -2842,8 +2939,8 @@
elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';
elm.style.left = pos.left + 'px';
}
-
- elm.style.visibility = a ? 'visible' : 'hidden';
+
+ $(elm).toggle();
}
// clear upload form
@@ -3036,6 +3133,7 @@
this.http_request('search', '_q='+urlencode(value)
+ (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')
+ (this.env.source ? '&_source='+urlencode(this.env.source) : '')
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : '')
+ (addurl ? addurl : ''), true);
}
return true;
@@ -3147,13 +3245,32 @@
// replace search string with full address
var pre = this.ksearch_input.value.substring(0, p);
var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
- var insert = this.env.contacts[id]+', ';
+ var insert = '';
+
+ // insert all members of a group
+ if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].id) {
+ insert += this.env.contacts[id].name + ', ';
+ this.group2expand = $.extend({}, this.env.contacts[id]);
+ this.group2expand.input = this.ksearch_input;
+ this.http_request('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] + ', ';
+
this.ksearch_input.value = pre + insert + end;
// set caret to insert pos
cpos = p+insert.length;
if (this.ksearch_input.setSelectionRange)
this.ksearch_input.setSelectionRange(cpos, cpos);
+ };
+
+ this.replace_group_recipients = function(id, recipients)
+ {
+ if (this.group2expand && this.group2expand.id == id) {
+ this.group2expand.input.value = this.group2expand.input.value.replace(this.group2expand.name, recipients);
+ this.group2expand = null;
+ }
};
// address search processor
@@ -3189,7 +3306,7 @@
if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
return;
- this.display_message(this.get_label('searching'), 'loading', true);
+ this.display_message(this.get_label('searching'), 'loading', false);
this.http_post('autocomplete', '_search='+urlencode(q));
};
@@ -3208,7 +3325,7 @@
{
// display search results
if (a_results.length && this.ksearch_input && this.ksearch_value) {
- var p, ul, li, s_val = this.ksearch_value;
+ var p, ul, li, text, s_val = this.ksearch_value;
// create results pane if not present
if (!this.ksearch_pane) {
@@ -3222,9 +3339,10 @@
ul.innerHTML = '';
// add each result line to list
- for (i=0; i<a_results.length; i++) {
+ for (i=0; i < a_results.length; i++) {
+ text = typeof a_results[i] == 'object' ? a_results[i].name : a_results[i];
li = document.createElement('LI');
- li.innerHTML = a_results[i].replace(new RegExp('('+s_val+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = text.replace(new RegExp('('+s_val+')', '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 = i;
@@ -3302,15 +3420,18 @@
return false;
};
- this.list_contacts = function(src, page)
+ this.list_contacts = function(src, group, page)
{
var add_url = '';
var target = window;
- if (!src)
+ // currently all groups belong to the local address book
+ if (group)
+ src = 0;
+ else if (!src)
src = this.env.source;
- if (page && this.current_page==page && src == this.env.source)
+ if (page && this.current_page == page && src == this.env.source && group == this.env.group)
return false;
if (src != this.env.source)
@@ -3319,14 +3440,18 @@
this.env.current_page = page;
this.reset_qsearch();
}
+ else if (group != this.env.group)
+ page = this.env.current_page = 1;
- this.select_folder(src, this.env.source);
+ this.select_folder((group ? 'G'+group : src), (this.env.group ? 'G'+this.env.group : this.env.source));
+
this.env.source = src;
+ this.env.group = group;
// load contacts remotely
if (this.gui_objects.contactslist)
{
- this.list_contacts_remote(src, page);
+ this.list_contacts_remote(src, group, page);
return;
}
@@ -3335,17 +3460,22 @@
target = window.frames[this.env.contentframe];
add_url = '&_framed=1';
}
+
+ if (group)
+ add_url += '&_gid='+group;
+ if (page)
+ add_url += '&_page='+page;
// also send search request to get the correct listing
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
this.set_busy(true, 'loading');
- target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
+ target.location.href = this.env.comm_path + (src ? '&_source='+urlencode(src) : '') + add_url;
};
// send remote request to load contacts list
- this.list_contacts_remote = function(src, page)
+ this.list_contacts_remote = function(src, group, page)
{
// clear message list first
this.contact_list.clear(true);
@@ -3355,6 +3485,10 @@
// send request to server
var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
this.env.source = src;
+ this.env.group = group;
+
+ if (group)
+ url += '&_gid='+group;
// also send search request to get the right messages
if (this.env.search_request)
@@ -3381,7 +3515,7 @@
if (action && (cid || action=='add') && !this.drag_active)
{
this.set_busy(true);
- target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
+ target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_cid='+urlencode(cid) + add_url;
}
return true;
};
@@ -3392,8 +3526,10 @@
if (!cid)
cid = this.contact_list.get_selection().join(',');
- if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
- this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
+ if (to.type == 'group')
+ this.http_post('group-addmembers', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(to.id));
+ else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly)
+ this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to.id));
};
@@ -3401,7 +3537,7 @@
{
// 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) || (!this.env.group && !confirm(this.get_label('deletecontactconfirm'))))
return;
var a_cids = new Array();
@@ -3429,7 +3565,11 @@
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);
+ if (this.env.group)
+ this.http_post('group-delmembers', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+qs);
+ else
+ this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+
return true;
};
@@ -3444,11 +3584,11 @@
// cid change
if (newcid) {
- row.id = 'rcmrow' + newcid;
+ row.id = 'rcmrow' + newcid;
this.contact_list.remove_row(cid);
this.contact_list.init_row(row);
- this.contact_list.selection[0] = newcid;
- row.style.display = '';
+ this.contact_list.selection[0] = newcid;
+ ow.style.display = '';
}
return true;
@@ -3486,6 +3626,138 @@
this.enable_command('export', (this.contact_list.rowcount > 0));
};
+
+
+ this.add_contact_group = function()
+ {
+ if (!this.gui_objects.folderlist || !this.env.address_sources[this.env.source].groups)
+ return;
+
+ if (!this.name_input) {
+ this.name_input = document.createElement('input');
+ this.name_input.type = 'text';
+ this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
+
+ this.gui_objects.folderlist.parentNode.appendChild(this.name_input);
+ }
+
+ this.name_input.select();
+ };
+
+ this.rename_contact_group = function()
+ {
+ if (!this.env.group || !this.gui_objects.folderlist)
+ return;
+
+ if (!this.name_input) {
+ this.enable_command('list', 'listgroup', false);
+ this.name_input = document.createElement('input');
+ this.name_input.type = 'text';
+ this.name_input.value = this.env.contactgroups['G'+this.env.group].name;
+ this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
+ this.env.group_renaming = true;
+
+ var link, li = this.get_folder_li(this.env.group, 'rcmliG');
+ if (li && (link = li.firstChild)) {
+ $(link).hide();
+ li.insertBefore(this.name_input, link);
+ }
+ }
+
+ this.name_input.select();
+ };
+
+ this.delete_contact_group = function()
+ {
+ if (this.env.group)
+ this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), true);
+ };
+
+ // callback from server upon group-delete command
+ this.remove_group_item = function(id)
+ {
+ var li, key = 'G'+id;
+ if ((li = this.get_folder_li(key))) {
+ this.triggerEvent('removegroup', { id:id, li:li });
+
+ li.parentNode.removeChild(li);
+ delete this.env.contactfolders[key];
+ delete this.env.contactgroups[key];
+ }
+
+ this.list_contacts(null, 0);
+ };
+
+ // handler for keyboard events on the input field
+ this.add_input_keypress = function(e)
+ {
+ var key = rcube_event.get_keycode(e);
+
+ // enter
+ if (key == 13) {
+ var newname = this.name_input.value;
+
+ if (newname) {
+ this.set_busy(true, 'loading');
+ if (this.env.group_renaming)
+ this.http_post('group-rename', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_name='+urlencode(newname), true);
+ else
+ this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), true);
+ }
+ return false;
+ }
+ // escape
+ else if (key == 27)
+ this.reset_add_input();
+
+ return true;
+ };
+
+ this.reset_add_input = function()
+ {
+ if (this.name_input) {
+ if (this.env.group_renaming) {
+ var li = this.name_input.parentNode;
+ $(li.lastChild).show();
+ this.env.group_renaming = false;
+ }
+
+ this.name_input.parentNode.removeChild(this.name_input);
+ this.name_input = null;
+ }
+
+ this.enable_command('list', 'listgroup', true);
+ };
+
+ // callback for creating a new contact group
+ this.insert_contact_group = function(prop)
+ {
+ this.reset_add_input();
+
+ prop.type = 'group';
+ var key = 'G'+prop.id;
+ this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
+
+ var link = $('<a>').attr('href', '#').attr('onclick', "return rcmail.command('listgroup','"+prop.id+"',this)").html(prop.name);
+ var li = $('<li>').attr('id', 'rcmli'+key).addClass('contactgroup').append(link);
+ $(this.gui_objects.folderlist).append(li);
+
+ this.triggerEvent('insertgroup', { id:prop.id, name:prop.name, li:li[0] });
+ };
+
+ // callback for renaming a contact group
+ this.update_contact_group = function(id, name)
+ {
+ this.reset_add_input();
+
+ var key = 'G'+id;
+ var link, li = this.get_folder_li(key);
+ if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
+ link.innerHTML = name;
+
+ this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
+ this.triggerEvent('updategroup', { id:id, name:name, li:li[0] });
+ };
/*********************************************************/
@@ -4195,31 +4467,33 @@
};
// mark a mailbox as selected and set environment variable
- this.select_folder = function(name, old)
+ this.select_folder = function(name, old, prefix)
{
if (this.gui_objects.folderlist)
{
var current_li, target_li;
- if ((current_li = this.get_folder_li(old))) {
+ if ((current_li = this.get_folder_li(old, prefix))) {
$(current_li).removeClass('selected').removeClass('unfocused');
}
- if ((target_li = this.get_folder_li(name))) {
+ if ((target_li = this.get_folder_li(name, prefix))) {
$(target_li).removeClass('unfocused').addClass('selected');
}
// trigger event hook
- this.triggerEvent('selectfolder', { folder:name, old:old });
+ this.triggerEvent('selectfolder', { folder:name, old:old, prefix:prefix });
}
};
// helper method to find a folder list item
- this.get_folder_li = function(name)
+ this.get_folder_li = function(name, prefix)
{
+ if (!prefix)
+ prefix = 'rcmli';
if (this.gui_objects.folderlist)
{
name = String(name).replace(this.identifier_expr, '_');
- return document.getElementById('rcmli'+name);
+ return document.getElementById(prefix+name);
}
return null;
@@ -4394,6 +4668,13 @@
var addrbook_show_images;
if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
addrbook_show_images.disabled = !checkbox.checked;
+ }
+
+ this.toggle_preview_pane = function(checkbox)
+ {
+ var preview_pane_mark_read;
+ if (preview_pane_mark_read = document.getElementById('rcmfd_preview_pane_mark_read'))
+ preview_pane_mark_read.disabled = !checkbox.checked;
}
// display fetched raw headers
@@ -4625,7 +4906,7 @@
if (this.env.contentframe)
this.show_contentframe(false);
// disable commands useless when mailbox is empty
- this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete',
+ this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment',
'purge', 'expunge', 'select-all', 'select-none', 'sort',
'expand-all', 'expand-unread', 'collapse-all', false);
@@ -4652,8 +4933,11 @@
else if (this.task == 'addressbook') {
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
- if (response.action == 'list')
+ if (response.action == 'list') {
+ this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
+ this.enable_command('group-rename', 'group-delete', this.env.address_sources[this.env.source].groups && this.env.group);
this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
+ }
}
break;
}
--
Gitblit v1.9.1