From d87fc29fee9e629fad49d956a449ae647c0bc142 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 11 Jun 2008 15:26:08 -0400
Subject: [PATCH] - don't call expunge and don't remove message row after message move if flag_for_deletion is set to true (#1485002)
---
program/js/app.js | 574 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 322 insertions(+), 252 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 2c212a8..96c9ec3 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -132,7 +132,7 @@
this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
- this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
+ this.message_list.addEventListener('dragstart', function(o){ p.drag_active = true; if (p.preview_timer) clearTimeout(p.preview_timer); });
this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
this.message_list.init();
@@ -146,6 +146,9 @@
else
this.message_list.focus();
}
+
+ if (this.env.coltypes)
+ this.set_message_coltypes(this.env.coltypes);
// enable mail commands
this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', true);
@@ -176,7 +179,6 @@
{
this.enable_command('compose', 'add-contact', false);
parent.rcmail.show_contentframe(true);
- parent.rcmail.mark_message('read', this.env.uid);
}
if ((this.env.action=='show' || this.env.action=='preview') && this.env.blockedobjects)
@@ -199,7 +201,7 @@
}
if (this.env.messagecount)
- this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+ this.enable_command('select-all', 'select-none', 'expunge', true);
if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
this.enable_command('purge', true);
@@ -308,10 +310,10 @@
break;
case 'login':
- var input_user = rcube_find_object('_user');
- var input_pass = rcube_find_object('_pass');
+ var input_user = rcube_find_object('rcmloginuser');
+ var input_pass = rcube_find_object('rcmloginpwd');
if (input_user)
- input_user.onkeypress = function(e){ return rcmail.login_user_keypress(e); };
+ input_user.onkeyup = function(e){ return rcmail.login_user_keyup(e); };
if (input_user && input_user.value=='')
input_user.focus();
else if (input_pass)
@@ -353,7 +355,7 @@
// start interval for keep-alive/recent_check signal
this.start_keepalive = function()
{
- if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.messagelist)
+ if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(); }, this.env.keep_alive * 1000);
else if (this.env.keep_alive && !this.env.framed && this.task!='login')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
@@ -403,7 +405,7 @@
this.init_address_input_events(input_cc);
if (input_bcc)
this.init_address_input_events(input_bcc);
-
+
// add signature according to selected identity
if (input_from && input_from.type=='select-one')
this.change_identity(input_from);
@@ -485,7 +487,7 @@
break;
case 'logout':
- this.goto_url('logout', true);
+ this.goto_url('logout', '', true);
break;
// commands to switch task
@@ -628,7 +630,7 @@
var input_email = rcube_find_object('_email');
// user prefs
- if (input_pagesize && isNaN(input_pagesize.value))
+ if (input_pagesize && isNaN(parseInt(input_pagesize.value)))
{
alert(this.get_label('nopagesizewarning'));
input_pagesize.focus();
@@ -692,7 +694,7 @@
if (props._row.uid)
{
uid = props._row.uid;
- this.message_list.dont_select = true;
+
// toggle read/unread
if (this.message_list.rows[uid].deleted) {
flag = 'undelete';
@@ -709,7 +711,7 @@
break;
case 'load-attachment':
- var qstring = '_mbox='+this.env.mailbox+'&_uid='+this.env.uid+'&_part='+props.part;
+ 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 && find_in_array(props.mimetype, this.mimetypes)>=0)
@@ -719,7 +721,7 @@
this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
if (this.attachment_win)
{
- setTimeout(function(){ ref.attachment_win.focus(); }, 10);
+ window.setTimeout(function(){ ref.attachment_win.focus(); }, 10);
break;
}
}
@@ -883,11 +885,15 @@
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)
- setTimeout(function(){ ref.printwin.focus(); }, 20);
+ {
+ window.setTimeout(function(){ ref.printwin.focus(); }, 20);
+ if (this.env.action != 'show')
+ this.mark_message('read', uid);
}
+ }
break;
case 'viewsource':
@@ -896,7 +902,7 @@
{
ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox));
if (this.sourcewin)
- setTimeout(function(){ ref.sourcewin.focus(); }, 20);
+ window.setTimeout(function(){ ref.sourcewin.focus(); }, 20);
}
break;
@@ -1013,7 +1019,7 @@
// set timer for requests
if (a && this.env.request_timeout)
- this.request_timer = setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
+ this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
};
@@ -1093,10 +1099,6 @@
this.unfocus_folder(id);
this.command('moveto', id);
}
-
- // Hide message command buttons until a message is selected
- this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
- return false;
};
this.click_on_list = function(e)
@@ -1135,8 +1137,8 @@
}
// start timer for message preview (wait for double click)
- if (selected && this.env.contentframe)
- this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
+ if (selected && this.env.contentframe && !list.multi_selecting)
+ this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
else if (this.env.contentframe)
this.show_contentframe(false);
};
@@ -1230,9 +1232,12 @@
var frm;
if (this.env.contentframe && (frm = rcube_find_object(this.env.contentframe)))
{
- if (!show && window.frames[this.env.contentframe] && frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
- frames[this.env.contentframe].location.href = this.env.blankpage;
- if (!bw.safari)
+ if (!show && window.frames[this.env.contentframe])
+ {
+ if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
+ window.frames[this.env.contentframe].location.href = this.env.blankpage;
+ }
+ else if (!bw.safari)
frm.style.display = show ? 'block' : 'none';
}
@@ -1380,11 +1385,8 @@
this.move_messages = function(mbox)
{
// exit if current or no mailbox specified or if selection is empty
- if (!mbox || !this.env.uid || mbox==this.env.mailbox)
- {
- if (!this.message_list || !this.message_list.get_selection().length)
- return;
- }
+ if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+ return;
var lock = false;
var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
@@ -1395,17 +1397,20 @@
lock = true;
this.set_busy(true, 'movingmessage');
}
- else
+ else if (!this.env.flag_for_deletion)
this.show_contentframe(false);
- this._with_selected_messages('moveto', lock, add_url);
+ // Hide message command buttons until a message is selected
+ this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
+
+ this._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true));
};
// delete selected messages from the current mailbox
this.delete_messages = function()
{
var selection = this.message_list ? this.message_list.get_selection() : new Array();
-
+
// exit if no mailbox specified or if selection is empty
if (!this.env.uid && !selection.length)
return;
@@ -1448,28 +1453,45 @@
return;
this.show_contentframe(false);
- this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
+ this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''), true);
};
// Send a specifc request with UIDs of all selected messages
// @private
- this._with_selected_messages = function(action, lock, add_url)
+ this._with_selected_messages = function(action, lock, add_url, remove)
{
var a_uids = new Array();
+
if (this.env.uid)
- a_uids[a_uids.length] = this.env.uid;
+ a_uids[0] = this.env.uid;
else
{
var selection = this.message_list.get_selection();
+ var rows = this.message_list.rows;
var id;
for (var n=0; n<selection.length; n++)
{
id = selection[n];
a_uids[a_uids.length] = id;
- this.message_list.remove_row(id, (n == selection.length-1));
+
+ if (remove)
+ this.message_list.remove_row(id, (n == selection.length-1));
+ else
+ {
+ rows[id].deleted = true;
+
+ if (rows[id].classname.indexOf('deleted')<0)
+ {
+ rows[id].classname += ' deleted';
+ this.set_classname(rows[id].obj, 'deleted', true);
+ }
+
+ if (rows[id].icon && this.env.deletedicon)
+ rows[id].icon.src = this.env.deletedicon;
+ }
}
}
-
+
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
@@ -1483,36 +1505,49 @@
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();
-
+
if (uid)
a_uids[0] = uid;
else if (this.env.uid)
a_uids[0] = this.env.uid;
else if (this.message_list)
{
- for (var id, n=0; n<selection.length; n++)
+ for (var n=0; n<selection.length; n++)
{
- id = selection[n];
- if ((flag=='read' && this.message_list.rows[id].unread) || (flag=='unread' && !this.message_list.rows[id].unread)
- || (flag=='delete' && !this.message_list.rows[id].deleted) || (flag=='undelete' && this.message_list.rows[id].deleted))
- a_uids[a_uids.length] = id;
+ a_uids[a_uids.length] = selection[n];
}
}
-
+
+ if (!this.message_list)
+ r_uids = a_uids;
+ else
+ for (var id, n=0; n<a_uids.length; n++)
+ {
+ id = a_uids[n];
+ if ((flag=='read' && this.message_list.rows[id].unread)
+ || (flag=='unread' && !this.message_list.rows[id].unread)
+ || (flag=='delete' && !this.message_list.rows[id].deleted)
+ || (flag=='undelete' && this.message_list.rows[id].deleted))
+ {
+ r_uids[r_uids.length] = id;
+ }
+ }
+
// nothing to do
- if (!a_uids.length)
+ if (!r_uids.length)
return;
-
+
switch (flag)
{
case 'read':
case 'unread':
- this.toggle_read_status(flag, a_uids);
+ this.toggle_read_status(flag, r_uids);
break;
case 'delete':
case 'undelete':
- this.toggle_delete_status(a_uids);
+ this.toggle_delete_status(r_uids);
break;
}
};
@@ -1543,34 +1578,52 @@
rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
this.set_classname(rows[uid].obj, 'unread', false);
- if (rows[uid].replied && this.env.repliedicon)
- icn_src = this.env.repliedicon;
- else if (this.env.messageicon)
+ if (this.env.messageicon)
icn_src = this.env.messageicon;
}
- if (rows[uid].icon && icn_src)
+ if (rows[uid].icon && icn_src
+ && !(rows[uid].replied && this.env.repliedicon)
+ && !(rows[uid].deleted && this.env.deletedicon))
rows[uid].icon.src = icn_src;
}
}
-
+
this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
};
+
+ // set class to read/unread
+ this.mark_as_read_from_preview = function(uid)
+ {
+ var icn_src;
+ var rows = parent.rcmail.message_list.rows;
+ if(rows[uid].unread)
+ {
+ rows[uid].unread = false;
+ rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+ parent.rcmail.set_classname(rows[uid].obj, 'unread', false);
+
+ if (rows[uid].replied && parent.rcmail.env.repliedicon)
+ icn_src = parent.rcmail.env.repliedicon;
+ else if (rows[uid].deleted && parent.rcmail.env.deletedicon)
+ icn_src = parent.rcmail.env.deletedicon;
+ else if (parent.rcmail.env.messageicon)
+ icn_src = parent.rcmail.env.messageicon;
+
+ if (rows[uid].icon && icn_src)
+ rows[uid].icon.src = icn_src;
+ }
+ }
+
// mark all message rows as deleted/undeleted
this.toggle_delete_status = function(a_uids)
{
- if (this.env.read_when_deleted)
- this.toggle_read_status('read',a_uids);
-
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
- var rows = this.message_list.rows;
+ var rows = this.message_list ? this.message_list.rows : new Array();
+
if (a_uids.length==1)
{
- if (rows[a_uids[0]] && rows[a_uids[0]].classname.indexOf('deleted') < 0)
+ if (!rows.length || (rows[a_uids[0]] && rows[a_uids[0]].classname.indexOf('deleted') < 0))
this.flag_as_deleted(a_uids);
else
this.flag_as_undeleted(a_uids);
@@ -1602,12 +1655,8 @@
this.flag_as_undeleted = function(a_uids)
{
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
var icn_src;
- var rows = this.message_list.rows;
+ var rows = this.message_list ? this.message_list.rows : new Array();
for (var i=0; i<a_uids.length; i++)
{
@@ -1626,6 +1675,7 @@
icn_src = this.env.repliedicon;
else if (this.env.messageicon)
icn_src = this.env.messageicon;
+
if (rows[uid].icon && icn_src)
rows[uid].icon.src = icn_src;
}
@@ -1638,37 +1688,73 @@
this.flag_as_deleted = function(a_uids)
{
- // if deleting message from "view message" don't bother with delete icon
- if (this.env.action == "show")
- return false;
-
- var rows = this.message_list.rows;
+ var add_url = '';
+ var r_uids = new Array();
+ var rows = this.message_list ? this.message_list.rows : new Array();
+
for (var i=0; i<a_uids.length; i++)
- {
+ {
uid = a_uids[i];
- if (rows[uid]) {
+ if (rows[uid])
+ {
rows[uid].deleted = true;
- if (rows[uid].classname.indexOf('deleted')<0) {
+ if (rows[uid].classname.indexOf('deleted')<0)
+ {
rows[uid].classname += ' deleted';
this.set_classname(rows[uid].obj, 'deleted', true);
- }
- if (rows[uid].icon && this.env.deletedicon)
+ }
+
+ if (rows[uid].icon && this.env.deletedicon)
rows[uid].icon.src = this.env.deletedicon;
- }
- }
- this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+ if (rows[uid].unread)
+ r_uids[r_uids.length] = uid;
+ }
+ }
+
+ if (r_uids.length)
+ add_url = '&_ruid='+r_uids.join(',');
+
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
return true;
};
+
+ // flag as read without mark request (called from backend)
+ // 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();
+
+ a_uids = str.split(',');
+
+ for (var uid, i=0; i<a_uids.length; i++)
+ {
+ uid = a_uids[i];
+ if (rows[uid])
+ {
+ rows[uid].unread = false;
+ rows[uid].read = true;
+
+ rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+ this.set_classname(rows[uid].obj, 'unread', false);
+
+ if (rows[uid].icon)
+ rows[uid].icon.src = this.env.deletedicon;
+ }
+ }
+ };
/*********************************************************/
/********* login form methods *********/
/*********************************************************/
// handler for keyboard events on the _user field
- this.login_user_keypress = function(e)
+ this.login_user_keyup = function(e)
{
var key = rcube_event.get_keycode(e);
var elm;
@@ -1692,11 +1778,14 @@
{
// check input fields
var input_to = rcube_find_object('_to');
+ var input_cc = rcube_find_object('_cc');
+ var input_bcc = rcube_find_object('_bcc');
var input_subject = rcube_find_object('_subject');
var input_message = rcube_find_object('_message');
// check for empty recipient
- if (input_to && !rcube_check_email(input_to.value.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
+ var recipients = input_to.value ? input_to.value : (input_cc.value ? input_cc.value : input_bcc.value);
+ if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
{
alert(this.get_label('norecipientwarning'));
input_to.focus();
@@ -1721,7 +1810,9 @@
}
// check for empty body
- if ((input_message.value == '' && (!window.tinyMCE || tinyMCE.getContent() == '')) && !confirm(this.get_label('nobodywarning')))
+ if ((input_message.value == '' &&
+ (!window.tinyMCE || tinyMCE.get('compose-body').getContent() == '')) &&
+ !confirm(this.get_label('nobodywarning')))
{
input_message.focus();
return false;
@@ -1759,12 +1850,12 @@
{
// check input fields
var input_to = rcube_find_object('_to');
- var input_cc = rcube_find_object('_to');
- var input_bcc = rcube_find_object('_to');
+ var input_cc = rcube_find_object('_cc');
+ var input_bcc = rcube_find_object('_bcc');
var input_subject = rcube_find_object('_subject');
- var input_message = rcube_find_object('_message');
-
+ var editor, input_message;
var str = '';
+
if (input_to && input_to.value)
str += input_to.value+':';
if (input_cc && input_cc.value)
@@ -1773,8 +1864,14 @@
str += input_bcc.value+':';
if (input_subject && input_subject.value)
str += input_subject.value+':';
- if (input_message && input_message.value)
+
+ if (editor = tinyMCE.get('compose-body'))
+ str += editor.getContent();
+ else
+ {
+ input_message = rcube_find_object('_message');
str += input_message.value;
+ }
if (save)
this.cmp_hash = str;
@@ -1826,25 +1923,17 @@
}
else
{
- var eid = tinyMCE.getEditorId('_message');
- // editor is a TinyMCE_Control object
- var editor = tinyMCE.getInstanceById(eid);
- // if this is null, we should exit
- if (editor == null) {
- return false;
- }
- var msgDoc = editor.getDoc();
- var msgBody = msgDoc.body;
+ var editor = tinyMCE.get('compose-body');
if (this.env.signatures && this.env.signatures[id])
{
// Append the signature as a span within the body
- var sigElem = msgDoc.getElementById("_rc_sig");
+ var sigElem = editor.dom.get("_rc_sig");
if (!sigElem)
{
- sigElem = msgDoc.createElement("span");
+ sigElem = editor.getDoc().createElement("span");
sigElem.setAttribute("id", "_rc_sig");
- msgBody.appendChild(sigElem);
+ editor.getBody().appendChild(sigElem);
}
if (this.env.signatures[id]['is_html'])
{
@@ -1920,7 +2009,7 @@
// have to do it this way for IE
// otherwise the form will be posted to a new window
- if(document.all && !window.opera)
+ if(document.all)
{
var html = '<iframe name="'+frame_name+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
document.body.insertAdjacentHTML('BeforeEnd',html);
@@ -1929,8 +2018,9 @@
{
var frame = document.createElement('IFRAME');
frame.name = frame_name;
- frame.width = 10;
- frame.height = 10;
+ frame.style.border = 'none';
+ frame.style.width = 0;
+ frame.style.height = 0;
frame.style.visibility = 'hidden';
document.body.appendChild(frame);
}
@@ -2004,7 +2094,7 @@
// reset vars
this.env.current_page = 1;
this.set_busy(true, 'searching');
- this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+this.env.mailbox : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
+ this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
}
return true;
};
@@ -2095,7 +2185,7 @@
}
// start timer
- this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(); }, 200);
+ this.ksearch_timer = window.setTimeout(function(){ ref.ksearch_get_results(); }, 200);
this.ksearch_input = obj;
return true;
@@ -2122,7 +2212,6 @@
cpos = p+insert.length;
if (this.ksearch_input.setSelectionRange)
this.ksearch_input.setSelectionRange(cpos, cpos);
-
};
@@ -2191,8 +2280,6 @@
{
li = document.createElement('LI');
li.innerHTML = a_results[i].replace(/</, '<').replace(/>/, '>');
- li.onmousedown = function(e){ ref.insert_recipient(this._rcm_id); ref.ksearch_pane.show(0); return rcube_event.cancel(e); };
- li.style.cursor = 'pointer';
li._rcm_id = a_result_ids[i];
ul.appendChild(li);
}
@@ -2270,7 +2357,7 @@
var id, frame, ref = this;
if (id = list.get_single_selection())
- this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, this.dblclick_time + 10);
+ this.preview_timer = window.setTimeout(function(){ ref.load_contact(id, 'show'); }, this.dblclick_time + 10);
else if (this.env.contentframe)
this.show_contentframe(false);
@@ -2411,7 +2498,7 @@
qs += '&_search='+this.env.search_request;
// send request to server
- this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_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);
return true;
};
@@ -2509,12 +2596,13 @@
var row, folder;
var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
- if (this.drag_active && (row = document.getElementById(id)))
+ if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
if (this.env.subscriptionrows[id] &&
(folder = this.env.subscriptionrows[id][0]))
{
if (this.check_droptarget(folder) &&
- (folder != this.env.folder.replace(reg, '')) &&
+ !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
+ (folder != this.env.folder.replace(reg, '')) &&
(!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
{
this.set_env('dstfolder', folder);
@@ -2546,11 +2634,13 @@
var id, folder;
if ((id = list.get_single_selection()) &&
this.env.subscriptionrows['rcmrow'+id] &&
- (folder = this.env.subscriptionrows['rcmrow'+id][0]) &&
- (find_in_array(this.env.defaultfolders, folder)!=0))
+ (folder = this.env.subscriptionrows['rcmrow'+id][0]))
this.set_env('folder', folder);
else
this.set_env('folder', null);
+
+ if (this.gui_objects.createfolderhint)
+ this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : '';
};
@@ -2573,17 +2663,25 @@
// tell server to create and subscribe a new mailbox
this.create_folder = function(name)
{
- if (this.edit_folder)
- this.reset_folder_rename();
+ if (this.edit_folder)
+ this.reset_folder_rename();
var form;
if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
+ {
name = form.elements['_folder_name'].value;
- if (this.env.folder)
- name = this.env.folder+this.env.delimiter+name;
- if (name)
+ if (name.indexOf(this.env.delimiter)>=0)
+ {
+ alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
+ return false;
+ }
+
+ if (this.env.folder && name != '')
+ name = this.env.folder+this.env.delimiter+name;
+
this.http_post('create-folder', '_name='+urlencode(name), true);
+ }
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
};
@@ -2596,20 +2694,20 @@
var temp, row, form;
// reset current renaming
- if (temp = this.edit_folder)
- {
- this.reset_folder_rename();
- if (temp == id)
- return;
- }
+ if (temp = this.edit_folder)
+ {
+ this.reset_folder_rename();
+ if (temp == id)
+ return;
+ }
if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
{
var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
this.name_input = document.createElement('INPUT');
- this.name_input.value = this.env.subscriptionrows[id][1].replace(reg, '');
+ this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.style.width = '100%';
-
+
reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
@@ -2628,11 +2726,9 @@
this.reset_folder_rename = function()
{
var cell = this.name_input ? this.name_input.parentNode : null;
+
if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
- {
- var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
- cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1].replace(reg, ' ');
- }
+ cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
this.edit_folder = null;
};
@@ -2649,8 +2745,15 @@
var newname = this.name_input ? this.name_input.value : null;
if (this.edit_folder && newname)
{
+ if (newname.indexOf(this.env.delimiter)>=0)
+ {
+ alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
+ return false;
+ }
+
if (this.name_input.__parent)
newname = this.name_input.__parent + this.env.delimiter + newname;
+
this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
}
}
@@ -2672,25 +2775,34 @@
{
this.http_post('delete-folder', '_mboxes='+urlencode(folder));
this.set_env('folder', null);
+
+ if (this.gui_objects.createfolderhint)
+ this.gui_objects.createfolderhint.innerHTML = '';
}
};
// add a new folder to the subscription list by cloning a folder row
- this.add_folder_row = function(name, display_name, replace)
+ this.add_folder_row = function(name, display_name, replace, before)
{
- name = name.replace('\\',"");
if (!this.gui_objects.subscriptionlist)
return false;
+ // find not protected folder
for (var refid in this.env.subscriptionrows)
- if (this.env.subscriptionrows[refid]!=null)
+ if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2])
break;
var refrow, form;
var tbody = this.gui_objects.subscriptionlist.tBodies[0];
- var id = replace && replace.id ? replace.id : 'rcmrow'+(tbody.childNodes.length+1);
+ var id = 'rcmrow'+(tbody.childNodes.length+1);
var selection = this.subscription_list.get_single_selection();
+
+ if (replace && replace.id)
+ {
+ id = replace.id;
+ refid = replace.id;
+ }
if (!id || !(refrow = document.getElementById(refid)))
{
@@ -2702,23 +2814,32 @@
// clone a table row if there are existing rows
var row = this.clone_table_row(refrow);
row.id = id;
- if (replace)
- tbody.replaceChild(row, replace);
+
+ if (before && (before = this.get_folder_row_id(before)))
+ tbody.insertBefore(row, document.getElementById(before));
else
- tbody.appendChild(row);
+ tbody.appendChild(row);
+
+ if (replace)
+ tbody.removeChild(replace);
}
// add to folder/row-ID map
- this.env.subscriptionrows[row.id] = [name, display_name];
+ this.env.subscriptionrows[row.id] = [name, display_name, 0];
// set folder name
row.cells[0].innerHTML = display_name;
- if (row.cells[1] && row.cells[1].firstChild.tagName=='INPUT')
+
+ // set messages count to zero
+ if (!replace)
+ row.cells[1].innerHTML = '*';
+
+ if (!replace && row.cells[2] && row.cells[2].firstChild.tagName=='INPUT')
{
- row.cells[1].firstChild.value = name;
- row.cells[1].firstChild.checked = true;
+ row.cells[2].firstChild.value = name;
+ row.cells[2].firstChild.checked = true;
}
-
+
// add new folder to rename-folder list and clear input field
if (!replace && (form = this.gui_objects.editform))
{
@@ -2728,7 +2849,6 @@
form.elements['_folder_name'].value = '';
}
- this.sort_subscription_list();
this.init_subscription_list();
if (selection && document.getElementById('rcmrow'+selection))
this.subscription_list.select_row(selection);
@@ -2739,13 +2859,13 @@
// replace an existing table row with a new folder line
- this.replace_folder_row = function(oldfolder, newfolder, display_name)
+ this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
{
var id = this.get_folder_row_id(oldfolder);
var row = document.getElementById(id);
// replace an existing table row (if found)
- this.add_folder_row(newfolder, display_name, row);
+ this.add_folder_row(newfolder, display_name, row, before);
// rename folder in rename-folder dropdown
var form, elm;
@@ -2764,7 +2884,7 @@
form.elements['_folder_newname'].value = '';
}
};
-
+
// remove the table row of a specific mailbox from the table
// (the row will not be removed, just hidden)
@@ -2773,7 +2893,7 @@
var row;
var id = this.get_folder_row_id(folder);
if (id && (row = document.getElementById(id)))
- row.style.display = 'none';
+ row.style.display = 'none';
// remove folder from rename-folder list
var form;
@@ -2796,59 +2916,17 @@
this.subscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_unsubscribed'])
- this.change_subscription('_unsubscribed', '_subscribed', 'subscribe');
- else if (folder)
- this.http_post('subscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('subscribe', '_mbox='+urlencode(folder));
};
this.unsubscribe_folder = function(folder)
{
- var form;
- if ((form = this.gui_objects.editform) && form.elements['_subscribed'])
- this.change_subscription('_subscribed', '_unsubscribed', 'unsubscribe');
- else if (folder)
- this.http_post('unsubscribe', '_mboxes='+urlencode(folder));
+ if (folder)
+ this.http_post('unsubscribe', '_mbox='+urlencode(folder));
};
-
- this.change_subscription = function(from, to, action)
- {
- var form;
- if (form = this.gui_objects.editform)
- {
- var a_folders = new Array();
- var list_from = form.elements[from];
-
- for (var i=0; list_from && i<list_from.options.length; i++)
- {
- if (list_from.options[i] && list_from.options[i].selected)
- {
- a_folders[a_folders.length] = list_from.options[i].value;
- list_from[i] = null;
- i--;
- }
- }
-
- // yes, we have some folders selected
- if (a_folders.length)
- {
- var list_to = form.elements[to];
- var index;
-
- for (var n=0; n<a_folders.length; n++)
- {
- index = list_to.options.length;
- list_to[index] = new Option(a_folders[n]);
- }
-
- this.http_post(action, '_mboxes='+urlencode(a_folders.join(',')));
- }
- }
-
- };
// helper method to find a specific mailbox row ID
this.get_folder_row_id = function(folder)
@@ -2882,32 +2960,6 @@
return new_row;
};
- // sort subscription folder list
- this.sort_subscription_list = function()
- {
- var index = new Array();
- var tbody = this.gui_objects.subscriptionlist.tBodies[0];
- var swapped = false;
- for (var i = 0; i<tbody.childNodes.length; i++)
- if (this.env.subscriptionrows[tbody.childNodes[i].id]!=null)
- index.push(i);
- for (i = 0; i<(index.length-1); i++)
- {
- var one = tbody.childNodes[index[i]];
- var two = tbody.childNodes[index[i+1]];
- if (this.env.subscriptionrows[one.id][0].toLowerCase()>
- this.env.subscriptionrows[two.id][0].toLowerCase())
- {
- var swap = one.cloneNode(true);
- tbody.replaceChild(swap, two);
- tbody.replaceChild(two, one);
- swapped = true;
- }
- }
- if (swapped)
- this.sort_subscription_list();
- };
-
/*********************************************************/
/********* GUI functionality *********/
@@ -2931,7 +2983,7 @@
var button, obj;
if(!a_buttons || !a_buttons.length)
- return;
+ return false;
for(var n=0; n<a_buttons.length; n++)
{
@@ -2999,7 +3051,7 @@
var button, img;
if(!a_buttons || !a_buttons.length)
- return;
+ return false;
for(var n=0; n<a_buttons.length; n++)
{
@@ -3011,6 +3063,7 @@
img.src = button.over;
}
}
+
};
// mouse down on button
@@ -3106,7 +3159,7 @@
this.gui_objects.message.onmousedown = function(){ _rcube.hide_message(); return true; };
if (!hold)
- this.message_timer = setTimeout(function(){ ref.hide_message(); }, this.message_time);
+ this.message_timer = window.setTimeout(function(){ ref.hide_message(); }, this.message_time);
};
@@ -3180,8 +3233,10 @@
cell.id = 'rcmHead'+col;
}
+
+ if (col == 'subject' && this.message_list)
+ this.message_list.subject_col = n+1;
}
-
};
// create a table row in the message list
@@ -3243,16 +3298,13 @@
this.set_page_buttons();
};
+
// replace content of quota display
- this.set_quota = function()
+ this.set_quota = function(content)
{
- if (this.gui_objects.quotadisplay &&
- this.gui_objects.quotadisplay.attributes.getNamedItem('display') &&
- this.gui_objects.quotadisplay.attributes.getNamedItem('id'))
- this.http_request('quotadisplay', '_display='+
- this.gui_objects.quotadisplay.attributes.getNamedItem('display').nodeValue+
- '&_id='+this.gui_objects.quotadisplay.attributes.getNamedItem('id').nodeValue, false);
- };
+ if (this.gui_objects.quotadisplay && content)
+ this.gui_objects.quotadisplay.innerHTML = content;
+ };
// update the mailboxlist
@@ -3261,11 +3313,8 @@
if (!this.gui_objects.mailboxlist)
return false;
- var reg, text_obj;
- var item = this.get_folder_li(mbox);
- mbox = String(mbox).toLowerCase().replace(this.identifier_expr, '');
-
- if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
+ var reg, text_obj, item;
+ if (item = this.get_folder_li(mbox))
{
// set new text
text_obj = item.firstChild;
@@ -3300,7 +3349,12 @@
}
};
-
+ // update parent's mailboxlist (from preview)
+ this.set_unread_count_from_preview = function(mbox, count, set_title)
+ {
+ parent.rcmail.set_unread_count(mbox, count, set_title);
+ }
+
// add row to contacts list
this.add_contact_row = function(cid, cols, select)
{
@@ -3331,16 +3385,16 @@
};
- this.toggle_editor = function(checkbox, textElementName)
+ this.toggle_editor = function(checkbox, textAreaId)
{
var ischecked = checkbox.checked;
if (ischecked)
{
- tinyMCE.execCommand('mceAddControl', true, textElementName);
+ tinyMCE.execCommand('mceAddControl', true, textAreaId);
}
else
{
- tinyMCE.execCommand('mceRemoveControl', true, textElementName);
+ tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
}
};
@@ -3462,22 +3516,38 @@
// process the response data according to the sent action
switch (request_obj.__action)
{
+
case 'delete':
case 'moveto':
if (this.env.action=='show')
this.command('list');
else if (this.message_list)
this.message_list.init();
- break;
+
+ case 'purge':
+ case 'expunge':
+ if (!this.env.messagecount)
+ {
+ // clear preview pane content
+ 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', 'mark', 'viewsource',
+ 'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+ }
+
+ break;
case 'list':
- if (this.env.messagecount)
- this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
- this.msglist_select(this.message_list);
+ this.msglist_select(this.message_list);
- case 'expunge':
- this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
- break;
+ case 'check-recent':
+ case 'getunread':
+ this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
+ this.enable_command('purge', (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox)));
+
+ break;
+
}
request_obj.reset();
@@ -3754,7 +3824,7 @@
// helper function to call the init method with a delay
function call_init(o)
{
- if (window[o] && window[o].init)
- setTimeout(o+'.init()', 200);
+ window.setTimeout('if (window[\''+o+'\'] && window[\''+o+'\'].init) { '+o+'.init(); }',
+ bw.win ? 500 : 200);
}
--
Gitblit v1.9.1