From 749b07c78a29b03c63812c3ec3630b16db4baa8f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 14 Dec 2005 18:47:32 -0500
Subject: [PATCH] IMAP bugfixes, better signature handling
---
program/js/app.js | 501 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 417 insertions(+), 84 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 7179898..a7445e2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6,7 +6,7 @@
| Copyright (C) 2005, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
- | Modified: 2005/10/21 (roundcube) |
+ | Modified: 2005/12/14 (roundcube) |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
@@ -19,6 +19,7 @@
function rcube_webmail()
{
this.env = new Object();
+ this.labels = new Object();
this.buttons = new Object();
this.gui_objects = new Object();
this.commands = new Object();
@@ -31,7 +32,8 @@
// webmail client settings
this.dblclick_time = 600;
this.message_time = 5000;
- this.request_timeout = 120000;
+ this.request_timeout = 180000;
+ this.kepp_alive_interval = 60000;
this.mbox_expression = new RegExp('[^0-9a-z\-_]', 'gi');
this.env.blank_img = 'skins/default/images/blank.gif';
@@ -48,6 +50,14 @@
//if (!this.busy)
this.env[name] = value;
};
+
+
+ // add a localized label to the client environment
+ this.add_label = function(key, value)
+ {
+ this.labels[key] = value;
+ };
+
// add a button to the button list
this.register_button = function(command, id, type, act, sel, over)
@@ -109,7 +119,7 @@
if (this.env.action=='show')
{
- this.enable_command('show', 'reply', 'forward', 'moveto', 'delete', 'viewsource', 'print', 'load-attachment', true);
+ this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'viewsource', 'print', 'load-attachment', true);
if (this.env.next_uid)
this.enable_command('nextmessage', true);
if (this.env.prev_uid)
@@ -200,7 +210,7 @@
this.enable_command('logout', true);
// disable browser's contextmenus
- //document.oncontextmenu = function(){ return false; }
+ // document.oncontextmenu = function(){ return false; }
// flag object as complete
this.loaded = true;
@@ -208,6 +218,10 @@
// show message
if (this.pending_message)
this.display_message(this.pending_message[0], this.pending_message[1]);
+
+ // start interval for keep-alive siganl
+ if (this.kepp_alive_interval)
+ this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval);
};
@@ -272,6 +286,7 @@
return false;
//this.messageform = this.gui_objects.messageform;
+ var input_from = rcube_find_object('_from');
var input_to = rcube_find_object('_to');
var input_cc = rcube_find_object('_cc');
var input_bcc = rcube_find_object('_bcc');
@@ -286,6 +301,10 @@
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);
if (input_to && input_to.value=='')
input_to.focus();
@@ -445,7 +464,35 @@
case 'sort':
// get the type of sorting
- this.list_mailbox('', '', props);
+ var a_sort = props.split('_');
+ var sort_col = a_sort[0];
+ var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : null;
+ var header;
+
+ // no sort order specified: toggle
+ if (sort_order==null)
+ {
+ if (this.env.sort_col==sort_col)
+ sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
+ else
+ sort_order = this.env.sort_order;
+ }
+
+ if (this.env.sort_col==sort_col && this.env.sort_order==sort_order)
+ break;
+
+ // set table header class
+ if (header = document.getElementById('rcmHead'+this.env.sort_col))
+ this.set_classname(header, 'sorted'+(this.env.sort_order.toUpperCase()), false);
+ if (header = document.getElementById('rcmHead'+sort_col))
+ this.set_classname(header, 'sorted'+sort_order, true);
+
+ // save new sort properties
+ this.env.sort_col = sort_col;
+ this.env.sort_order = sort_order;
+
+ // reload message list
+ this.list_mailbox('', '', sort_col+'_'+sort_order);
break;
case 'nextpage':
@@ -494,7 +541,37 @@
case 'save-identity':
case 'save':
if (this.gui_objects.editform)
+ {
+ var input_pagesize = rcube_find_object('_pagesize');
+ var input_name = rcube_find_object('_name');
+ var input_email = rcube_find_object('_email');
+
+ // user prefs
+ if (input_pagesize && isNaN(input_pagesize.value))
+ {
+ alert(this.get_label('nopagesizewarning'));
+ input_pagesize.focus();
+ break;
+ }
+ // contacts/identities
+ else
+ {
+ if (input_name && input_name.value == '')
+ {
+ alert(this.get_label('nonamewarning'));
+ input_name.focus();
+ break;
+ }
+ else if (input_email && !rcube_check_email(input_email.value))
+ {
+ alert(this.get_label('noemailwarning'));
+ input_email.focus();
+ break;
+ }
+ }
+
this.gui_objects.editform.submit();
+ }
break;
case 'delete':
@@ -620,14 +697,46 @@
var input_to = rcube_find_object('_to');
var input_subject = rcube_find_object('_subject');
var input_message = rcube_find_object('_message');
-
- if (input_to.value!='' && input_message.value!='')
+
+ // check for empty recipient
+ if (input_to && !rcube_check_email(input_to.value, true))
{
- this.set_busy(true, 'sendingmessage');
- var form = this.gui_objects.messageform;
- form.submit();
+ alert(this.get_label('norecipientwarning'));
+ input_to.focus();
+ break;
}
-
+
+ // display localized warning for missing subject
+ if (input_subject && input_subject.value == '')
+ {
+ var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));
+
+ // user hit cancel, so don't send
+ if (!subject && subject !== '')
+ {
+ input_subject.focus();
+ break;
+ }
+ else
+ {
+ input_subject.value = subject ? subject : this.get_label('nosubject');
+ }
+ }
+
+ // check for empty body
+ if (input_message.value=='')
+ {
+ if (!confirm(this.get_label('nobodywarning')))
+ {
+ input_message.focus();
+ break;
+ }
+ }
+
+ // all checks passed, send message
+ this.set_busy(true, 'sendingmessage');
+ var form = this.gui_objects.messageform;
+ form.submit();
break;
case 'add-attachment':
@@ -637,12 +746,13 @@
this.upload_file(props)
break;
+ case 'reply-all':
case 'reply':
var uid;
if (uid = this.get_single_uid())
{
this.set_busy(true);
- location.href = this.env.comm_path+'&_action=compose&_reply_uid='+uid+'&_mbox='+escape(this.env.mailbox);
+ location.href = this.env.comm_path+'&_action=compose&_reply_uid='+uid+'&_mbox='+escape(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : '');
}
break;
@@ -709,7 +819,7 @@
break;
case 'delete-folder':
- if (confirm('Do you really want to delete this folder?'))
+ if (confirm(this.get_label('deletefolderconfirm')))
this.delete_folder(props);
break;
@@ -741,7 +851,13 @@
this.set_busy = function(a, message)
{
if (a && message)
- this.display_message('Loading...', 'loading', true);
+ {
+ var msg = this.get_label(message);
+ if (msg==message)
+ msg = 'Loading...';
+
+ this.display_message(msg, 'loading', true);
+ }
else if (!a && this.busy)
this.hide_message();
@@ -761,13 +877,28 @@
};
+ // return a localized string
+ this.get_label = function(name)
+ {
+ if (this.labels[name])
+ return this.labels[name];
+ else
+ return name;
+ };
+
+
+ // switch to another application task
this.switch_task = function(task)
{
- if (this.task===task)
+ if (this.task===task && task!='mail')
return;
+ var url = this.get_task_url(task);
+ if (task=='mail')
+ url += '&_mbox=INBOX';
+
this.set_busy(true);
- location.href = this.get_task_url(task);
+ location.href = url;
};
@@ -816,8 +947,8 @@
if (!this.in_selection_before)
{
- var shift = this.check_shiftkey(e);
- this.select(id, shift);
+ var ctrl = this.check_ctrlkey(e);
+ this.select(id, ctrl);
}
if (this.selection.length)
@@ -834,7 +965,7 @@
// onmouseup-handler of message list row
this.click_row = function(e, id)
{
- var shift = this.check_shiftkey(e);
+ var ctrl = this.check_ctrlkey(e);
// don't do anything (another action processed before)
if (this.dont_select)
@@ -844,13 +975,13 @@
}
if (!this.drag_active && this.in_selection_before==id)
- this.select(id, (shift && this.task!='settings'));
+ this.select(id, (ctrl && this.task!='settings'));
this.drag_start = false;
this.in_selection_before = false;
// row was double clicked
- if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !shift)
+ if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !ctrl)
{
this.show_message(id);
return false;
@@ -925,7 +1056,7 @@
// enable/disable commands for message
if (this.task=='mail')
{
- this.enable_command('show', 'reply', 'forward', 'print', selected);
+ this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
}
else if (this.task=='addressbook')
@@ -1077,7 +1208,7 @@
// send request to server
var url = '_mbox='+escape(mbox)+(page ? '&_page='+page : '');
this.set_busy(true, 'loading');
- this.http_request('list', url+add_url);
+ this.http_request('list', url+add_url, true);
};
@@ -1105,13 +1236,18 @@
this.message_rows[id].obj.style.display = 'none';
}
}
+
+ var lock = false;
// show wait message
if (this.env.action=='show')
+ {
+ lock = true;
this.set_busy(true, 'movingmessage');
+ }
// send request to server
- this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_target_mbox='+escape(mbox)+'&_from='+(this.env.action ? this.env.action : ''));
+ this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_target_mbox='+escape(mbox)+'&_from='+(this.env.action ? this.env.action : ''), lock);
};
@@ -1180,16 +1316,15 @@
if (this.message_rows[uid].classname.indexOf('unread')<0 && this.message_rows[uid].unread)
{
this.message_rows[uid].classname += ' unread';
- if (!this.in_selection(uid))
- this.message_rows[uid].obj.className += ' unread';
+ this.set_classname(this.message_rows[uid].obj, 'unread', true);
+
if (this.env.unreadicon)
icn_src = this.env.unreadicon;
}
else if (!this.message_rows[uid].unread)
{
this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*unread/, '');
- if (!this.in_selection(uid))
- this.message_rows[uid].obj.className = this.message_rows[uid].obj.className.replace(/\s*unread/, '');
+ this.set_classname(this.message_rows[uid].obj, 'unread', false);
if (this.message_rows[uid].replied && this.env.repliedicon)
icn_src = this.env.repliedicon;
@@ -1211,6 +1346,44 @@
/*********************************************************/
/********* message compose methods *********/
/*********************************************************/
+
+
+ this.change_identity = function(obj)
+ {
+ if (!obj || !obj.options)
+ return false;
+
+ var id = obj.options[obj.selectedIndex].value;
+ var input_message = rcube_find_object('_message');
+ var message = input_message ? input_message.value : '';
+ var sig, p;
+
+ // remove the 'old' signature
+ if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
+ {
+ sig = this.env.signatures[this.env.identity];
+ if (sig.indexOf('-- ')!=0)
+ sig = '-- \n'+sig;
+
+ p = message.lastIndexOf(sig);
+ if (p>=0)
+ message = message.substring(0, p-1) + message.substring(p+sig.length, message.length);
+ }
+
+ // add the new signature string
+ if (this.env.signatures && this.env.signatures[id])
+ {
+ sig = this.env.signatures[id];
+ if (sig.indexOf('-- ')!=0)
+ sig = '-- \n'+sig;
+ message += '\n'+sig;
+ }
+
+ if (input_message)
+ input_message.value = message;
+
+ this.env.identity = id;
+ };
this.show_attachment_form = function(a)
@@ -1581,7 +1754,7 @@
// send request to server
var url = page ? '&_page='+page : '';
this.set_busy(true, 'loading');
- this.http_request('list', url);
+ this.http_request('list', url, true);
};
@@ -1723,7 +1896,7 @@
name = form.elements['_folder_name'].value;
if (name)
- this.http_request('create-folder', '_name='+escape(name));
+ this.http_request('create-folder', '_name='+escape(name), true);
else if (form.elements['_folder_name'])
form.elements['_folder_name'].focus();
};
@@ -1733,16 +1906,20 @@
{
if (folder)
{
- for (var id in this.env.subscriptionrows)
- if (this.env.subscriptionrows[id]==folder)
- break;
-
- var row;
- if (id && (row = document.getElementById(id)))
- row.style.display = 'none';
-
this.http_request('delete-folder', '_mboxes='+escape(folder));
}
+ };
+
+
+ this.remove_folder_row = function(folder)
+ {
+ for (var id in this.env.subscriptionrows)
+ if (this.env.subscriptionrows[id]==folder)
+ break;
+
+ var row;
+ if (id && (row = document.getElementById(id)))
+ row.style.display = 'none';
};
@@ -2024,18 +2201,17 @@
if (this.gui_objects.mailboxlist)
{
var item, reg, text_obj;
+ var s_current = this.env.mailbox.toLowerCase().replace(this.mbox_expression, '');
var s_mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
var s_current = this.env.mailbox.toLowerCase().replace(this.mbox_expression, '');
- var nodes = this.gui_objects.mailboxlist.getElementsByTagName('LI');
- for (var n=0; n<nodes.length; n++)
- {
- item = nodes[n];
- if (item.className && item.className.indexOf('mailbox '+s_mbox+' ')>=0)
- this.set_classname(item, 'selected', true);
- else if (item.className && item.className.indexOf('mailbox '+s_current)>=0)
- this.set_classname(item, 'selected', false);
- }
+ var current_li = document.getElementById('rcmbx'+s_current);
+ var mbox_li = document.getElementById('rcmbx'+s_mbox);
+
+ if (current_li)
+ this.set_classname(current_li, 'selected', false);
+ if (mbox_li)
+ this.set_classname(mbox_li, 'selected', true);
}
this.env.mailbox = mbox;
@@ -2236,18 +2412,29 @@
/********************************************************/
- // send a http request to the server
- this.http_request = function(action, querystring)
+ this.http_sockets = new Array();
+
+ // find a non-busy socket or create a new one
+ this.get_request_obj = function()
{
- if (window.XMLHttpRequest)
- this.request_obj = new XMLHttpRequest();
- else if (window.ActiveXObject)
- this.request_obj = new ActiveXObject("Microsoft.XMLHTTP");
- else
+ for (var n=0; n<this.http_sockets.length; n++)
{
-
+ if (!this.http_sockets[n].busy)
+ return this.http_sockets[n];
}
+
+ // create a new XMLHTTP object
+ var i = this.http_sockets.length;
+ this.http_sockets[i] = new rcube_http_request();
+ return this.http_sockets[i];
+ };
+
+
+ // send a http request to the server
+ this.http_request = function(action, querystring, lock)
+ {
+ var request_obj = this.get_request_obj();
querystring += '&_remote=1';
// add timestamp to request url to avoid cacheing problems in Safari
@@ -2255,51 +2442,77 @@
querystring += '&_ts='+(new Date().getTime());
// send request
- if (this.request_obj)
+ if (request_obj)
{
// prompt('request', this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
console('HTTP request: '+this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
- this.set_busy(true);
- this.request_action = action;
- this.request_obj.onreadystatechange = function(){ rcube_webmail_client.http_response(); };
- this.request_obj.open('GET', this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
- this.request_obj.send(null);
+
+ if (lock)
+ this.set_busy(true);
+
+ request_obj.__lock = lock ? true : false;
+ request_obj.__action = action;
+ request_obj.onerror = function(o){ rcube_webmail_client.http_error(o); };
+ request_obj.oncomplete = function(o){ rcube_webmail_client.http_response(o); };
+ request_obj.GET(this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
}
};
- // handle http response
- this.http_response = function()
+ // handle HTTP response
+ this.http_response = function(request_obj)
{
- if (this.request_obj.readyState == 4) // || this.request_obj.readyState == 2)
- {
- var ctype = this.request_obj.getResponseHeader('Content-Type');
- if (ctype)
- ctype = String(ctype).toLowerCase();
+ var ctype = request_obj.get_header('Content-Type');
+ if (ctype)
+ ctype = String(ctype).toLowerCase();
+ if (request_obj.__lock)
this.set_busy(false);
- console(this.request_obj.responseText);
+ console(request_obj.responseText);
- // if we get javascript code from server -> execute it
- if (this.request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript'))
- eval(this.request_obj.responseText);
+ // if we get javascript code from server -> execute it
+ if (request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript'))
+ eval(request_obj.responseText);
- // process the response data according to the sent action
- switch (this.request_action)
- {
- case 'delete':
- case 'moveto':
- if (this.env.action=='show')
- this.command('list');
- break;
+ // 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');
+ break;
- case 'list':
- this.enable_command('select-all', 'select-none', this.env.messagecount ? true : false);
- break;
- }
+ case 'list':
+ this.enable_command('select-all', 'select-none', this.env.messagecount ? true : false);
+ break;
}
+
+ request_obj.reset();
};
+
+
+ // handle HTTP request errors
+ this.http_error = function(request_obj)
+ {
+ alert('Error sending request: '+request_obj.url);
+
+ if (request_obj.__lock)
+ this.set_busy(false);
+
+ request_obj.reset();
+ request_obj.__lock = false;
+ };
+
+
+ // use an image to send a keep-alive siganl to the server
+ this.send_keep_alive = function()
+ {
+ var d = new Date();
+ this.http_request('keep-alive', '_t='+d.getTime());
+ };
+
/********************************************************/
@@ -2334,6 +2547,21 @@
return false;
}
+ // check if Shift-key is pressed on event
+ this.check_ctrlkey = function(e)
+ {
+ if(!e && window.event)
+ e = window.event;
+
+ if(bw.linux && bw.ns4 && e.modifiers)
+ return true;
+ else if (bw.mac)
+ return this.check_shiftkey(e);
+ else if((bw.ns4 && e.modifiers & Event.CTRL_MASK) || (e && e.ctrlKey))
+ return true;
+ else
+ return false;
+ }
this.get_mouse_pos = function(e)
{
@@ -2415,6 +2643,111 @@
+// class for HTTP requests
+function rcube_http_request()
+ {
+ this.url = '';
+ this.busy = false;
+ this.xmlhttp = null;
+
+
+ // reset object properties
+ this.reset = function()
+ {
+ // set unassigned event handlers
+ this.onloading = function(){ };
+ this.onloaded = function(){ };
+ this.oninteractive = function(){ };
+ this.oncomplete = function(){ };
+ this.onabort = function(){ };
+ this.onerror = function(){ };
+
+ this.url = '';
+ this.busy = false;
+ this.xmlhttp = null;
+ }
+
+
+ // create HTMLHTTP object
+ this.build = function()
+ {
+ if (window.XMLHttpRequest)
+ this.xmlhttp = new XMLHttpRequest();
+ else if (window.ActiveXObject)
+ this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+ else
+ {
+
+ }
+ }
+
+ // sedn GET request
+ this.GET = function(url)
+ {
+ this.build();
+
+ if (!this.xmlhttp)
+ {
+ this.onerror(this);
+ return false;
+ }
+
+ var ref = this;
+ this.url = url;
+ this.busy = true;
+
+ this.xmlhttp.onreadystatechange = function(){ ref.xmlhttp_onreadystatechange(); };
+ this.xmlhttp.open('GET', url);
+ this.xmlhttp.send(null);
+ };
+
+
+ this.POST = function(url, a_param)
+ {
+ // not implemented yet
+ };
+
+
+ // handle onreadystatechange event
+ this.xmlhttp_onreadystatechange = function()
+ {
+ if(this.xmlhttp.readyState == 1)
+ this.onloading(this);
+
+ else if(this.xmlhttp.readyState == 2)
+ this.onloaded(this);
+
+ else if(this.xmlhttp.readyState == 3)
+ this.oninteractive(this);
+
+ else if(this.xmlhttp.readyState == 4)
+ {
+ this.responseText = this.xmlhttp.responseText;
+ this.responseXML = this.xmlhttp.responseXML;
+
+ if(this.xmlhttp.status == 0)
+ this.onabort(this);
+ else if(this.xmlhttp.status == 200)
+ this.oncomplete(this);
+ else
+ this.onerror(this);
+
+ this.busy = false;
+ }
+ }
+
+ // getter method for HTTP headers
+ this.get_header = function(name)
+ {
+ return this.xmlhttp.getResponseHeader(name);
+ };
+
+
+ this.reset();
+
+ } // end class rcube_http_request
+
+
function console(str)
{
--
Gitblit v1.9.1