From be2380fb47b05a222ec5b22deff36d5156a8c943 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 13:08:41 -0500
Subject: [PATCH] Added labels for LDAP search
---
program/js/app.js | 330 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 269 insertions(+), 61 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 213f62b..ad91e1f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6,11 +6,11 @@
| Copyright (C) 2005, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
- | Modified: 2005/12/16 (roundcube) |
- | |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
+
+ $Id$
*/
@@ -137,7 +137,7 @@
this.enable_command('add-attachment', 'send-attachment', 'send', true);
if (this.env.messagecount)
- this.enable_command('select-all', 'select-none', 'sort', true);
+ this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
this.set_page_buttons();
@@ -151,15 +151,24 @@
// show printing dialog
if (this.env.action=='print')
window.print();
+
+ // get unread count for each mailbox
+ if (this.gui_objects.mailboxlist)
+ this.http_request('getunread', '');
break;
case 'addressbook':
- var contacts_list = this.gui_objects.contactslist;
+ var contacts_list = this.gui_objects.contactslist;
+ var ldap_contacts_list = this.gui_objects.ldapcontactslist;
+
if (contacts_list)
this.init_contactslist(contacts_list);
+ if (ldap_contacts_list)
+ this.init_ldapsearchlist(ldap_contacts_list);
+
this.set_page_buttons();
if (this.env.cid)
@@ -169,6 +178,9 @@
this.enable_command('save', true);
this.enable_command('list', 'add', true);
+
+ this.enable_command('ldappublicsearch', this.env.ldappublicsearch);
+
break;
@@ -219,8 +231,10 @@
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)
+ // start interval for keep-alive/recent_check signal
+ if (this.kepp_alive_interval && this.task=='mail' && this.gui_objects.messagelist)
+ this.kepp_alive_int = setInterval(this.ref+'.check_for_recent()', this.kepp_alive_interval);
+ else
this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval);
};
@@ -368,6 +382,26 @@
};
+ // get all contact rows from HTML table and init each row
+ this.init_ldapsearchlist = function(ldap_contacts_list)
+ {
+ if (ldap_contacts_list && ldap_contacts_list.tBodies[0])
+ {
+ this.ldap_contact_rows = new Array();
+
+ var row;
+ for(var r=0; r<ldap_contacts_list.tBodies[0].childNodes.length; r++)
+ {
+ row = ldap_contacts_list.tBodies[0].childNodes[r];
+ this.init_table_row(row, 'ldap_contact_rows');
+ }
+ }
+
+ // alias to common rows array
+ this.list_rows = this.ldap_contact_rows;
+ };
+
+
// make references in internal array and set event handlers
this.init_table_row = function(row, array_name)
{
@@ -436,6 +470,15 @@
return false;
}
+
+
+ // check input before leaving compose step
+ if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
+ {
+ if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
+ return false;
+ }
+
// process command
switch (command)
@@ -460,13 +503,7 @@
// misc list commands
case 'list':
if (this.task=='mail')
- {
- // check input before leaving compose step
- if (this.env.action=='compose' && this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
- break;
-
this.list_mailbox(props);
- }
else if (this.task=='addressbook')
this.list_contacts();
break;
@@ -512,6 +549,16 @@
this.list_page('prev');
break;
+ case 'expunge':
+ if (this.env.messagecount)
+ this.expunge_mailbox(this.env.mailbox);
+ break;
+
+ case 'clear-mailbox':
+ //if (this.env.messagecount)
+ //this.clear_mailbox(this.env.mailbox);
+ break;
+
// common commands used in multiple tasks
case 'show':
@@ -531,7 +578,15 @@
case 'add':
if (this.task=='addressbook')
- this.load_contact(0, 'add');
+ if (!window.frames[this.env.contentframe].rcmail)
+ this.load_contact(0, 'add');
+ else
+ {
+ if (window.frames[this.env.contentframe].rcmail.selection.length)
+ this.add_ldap_contacts();
+ else
+ this.load_contact(0, 'add');
+ }
else if (this.task=='settings')
{
this.clear_selection();
@@ -665,7 +720,8 @@
this.show_message(this.env.prev_uid);
//location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox;
break;
-
+
+
case 'compose':
var url = this.env.comm_path+'&_action=compose';
@@ -682,21 +738,36 @@
// get selected contacts
else
{
- for (var n=0; n<this.selection.length; n++)
- a_cids[a_cids.length] = this.selection[n];
+ if (!window.frames[this.env.contentframe].rcmail.selection.length)
+ {
+ for (var n=0; n<this.selection.length; n++)
+ a_cids[a_cids.length] = this.selection[n];
+ }
+ else
+ {
+ var frameRcmail = window.frames[this.env.contentframe].rcmail;
+ // get the email address(es)
+ for (var n=0; n<frameRcmail.selection.length; n++)
+ a_cids[a_cids.length] = frameRcmail.ldap_contact_rows[frameRcmail.selection[n]].obj.cells[1].innerHTML;
+ }
}
-
if (a_cids.length)
url += '&_to='+a_cids.join(',');
else
break;
+
}
else if (props)
url += '&_to='+props;
+
+ // don't know if this is necessary...
+ url = url.replace(/&_framed=1/, "");
this.set_busy(true);
- location.href = url;
- break;
+
+ // need parent in case we are coming from the contact frame
+ parent.window.location.href = url;
+ break;
case 'send':
if (!this.gui_objects.messageform)
@@ -760,6 +831,15 @@
case 'add-contact':
this.add_contact(props);
break;
+
+
+ // ldap search
+ case 'ldappublicsearch':
+ if (this.gui_objects.ldappublicsearchform)
+ this.gui_objects.ldappublicsearchform.submit();
+ else
+ this.ldappublicsearch(command);
+ break;
// user settings commands
@@ -937,7 +1017,7 @@
// onmouseup-handler of message list row
this.click_row = function(e, id)
{
- var ctrl = this.check_ctrlkey(e);
+ var shift = this.check_shiftkey(e);
// don't do anything (another action processed before)
if (this.dont_select)
@@ -947,26 +1027,58 @@
}
if (!this.drag_active && this.in_selection_before==id)
- this.select(id, (ctrl && this.task!='settings'));
+ {
+ this.select(id, (shift && 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 && !ctrl)
+ if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !shift)
{
this.show_message(id);
return false;
}
else if (this.task=='addressbook')
{
- if (this.selection.length==1 && this.env.contentframe)
+ if (this.contact_rows && this.selection.length==1)
+ {
this.load_contact(this.selection[0], 'show', true);
- else if (this.task=='addressbook' && this.list_rows && this.list_rows[id].clicked)
+ // change the text for the add contact button
+ var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A');
+ for (i = 0; i < links.length; i++)
+ {
+ var onclickstring = new String(links[i].onclick);
+ if (onclickstring.search('\"add\"') != -1)
+ links[i].title = this.env.newcontact;
+ }
+ }
+ else if (this.contact_rows && this.contact_rows[id].clicked)
{
this.load_contact(id, 'show');
return false;
}
+ else if (this.ldap_contact_rows && !this.ldap_contact_rows[id].clicked)
+ {
+ // clear selection
+ parent.rcmail.clear_selection();
+
+ // disable delete
+ parent.rcmail.set_button('delete', 'pas');
+
+ // change the text for the add contact button
+ var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A');
+ for (i = 0; i < links.length; i++)
+ {
+ var onclickstring = new String(links[i].onclick);
+ if (onclickstring.search('\"add\"') != -1)
+ links[i].title = this.env.addcontact;
+ }
+ }
+ // handle double click event
+ else if (this.ldap_contact_rows && this.selection.length==1 && this.ldap_contact_rows[id].clicked)
+ this.command('compose', this.ldap_contact_rows[id].obj.cells[1].innerHTML);
else if (this.env.contentframe)
{
var elm = document.getElementById(this.env.contentframe);
@@ -984,7 +1096,6 @@
return false;
};
-
@@ -1168,7 +1279,18 @@
// send remote request to load message list
this.list_mailbox_remote = function(mbox, page, add_url)
{
- // clear message list
+ // clear message list first
+ this.clear_message_list();
+
+ // send request to server
+ var url = '_mbox='+escape(mbox)+(page ? '&_page='+page : '');
+ this.set_busy(true, 'loading');
+ this.http_request('list', url+add_url, true);
+ };
+
+
+ this.clear_message_list = function()
+ {
var table = this.gui_objects.messagelist;
var tbody = document.createElement('TBODY');
table.insertBefore(tbody, table.tBodies[0]);
@@ -1176,11 +1298,26 @@
this.message_rows = new Array();
this.list_rows = this.message_rows;
+
+ };
+
+
+ this.expunge_mailbox = function(mbox)
+ {
+ var lock = false;
+ var add_url = '';
+
+ // lock interface if it's the active mailbox
+ if (mbox == this.env.mailbox)
+ {
+ lock = true;
+ this.set_busy(true, 'loading');
+ add_url = '&_reload=1';
+ }
// send request to server
- var url = '_mbox='+escape(mbox)+(page ? '&_page='+page : '');
- this.set_busy(true, 'loading');
- this.http_request('list', url+add_url, true);
+ var url = '_mbox='+escape(mbox);
+ this.http_request('expunge', url+add_url, lock);
};
@@ -1876,6 +2013,50 @@
};
+
+ // load ldap search form
+ this.ldappublicsearch = function(action)
+ {
+ var add_url = '';
+ var target = window;
+ if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
+ {
+ add_url = '&_framed=1';
+ target = window.frames[this.env.contentframe];
+ document.getElementById(this.env.contentframe).style.visibility = 'inherit';
+ }
+ else
+ return false;
+
+
+ if (action == 'ldappublicsearch')
+ target.location.href = this.env.comm_path+'&_action='+action+add_url;
+ };
+
+ // add ldap contacts to address book
+ this.add_ldap_contacts = function()
+ {
+ if (window.frames[this.env.contentframe].rcmail)
+ {
+ var frame = window.frames[this.env.contentframe];
+
+ // build the url
+ var url = '&_framed=1';
+ var emails = '&_emails=';
+ var names = '&_names=';
+ var end = '';
+ for (var n=0; n<frame.rcmail.selection.length; n++)
+ {
+ end = n < frame.rcmail.selection.length - 1 ? ',' : '';
+ emails += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[1].innerHTML + end;
+ names += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[0].innerHTML + end;
+ }
+
+ frame.location.href = this.env.comm_path + '&_action=save&_framed=1' + emails + names;
+ }
+ return false;
+ }
+
/*********************************************************/
@@ -2263,7 +2444,7 @@
// create a table row in the message list
- this.add_message_row = function(uid, cols, flags, attachment)
+ this.add_message_row = function(uid, cols, flags, attachment, attop)
{
if (!this.gui_objects.messagelist || !this.gui_objects.messagelist.tBodies[0])
return false;
@@ -2277,8 +2458,8 @@
var row = document.createElement('TR');
row.id = 'rcmrow'+uid;
- row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '');
-
+ row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : '');
+
if (this.in_selection(uid))
row.className += ' selected';
@@ -2304,7 +2485,11 @@
col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : '';
row.appendChild(col);
- tbody.appendChild(row);
+ if (attop && tbody.rows.length)
+ tbody.insertBefore(row, tbody.firstChild);
+ else
+ tbody.appendChild(row);
+
this.init_message_row(row);
};
@@ -2321,35 +2506,44 @@
// update the mailboxlist
- this.set_unread_count = function(mbox, count)
+ this.set_unread_count = function(mbox, count, set_title)
{
if (!this.gui_objects.mailboxlist)
return false;
- mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
-
var item, reg, text_obj;
- for (var n=0; n<this.gui_objects.mailboxlist.childNodes.length; n++)
+ mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
+ item = document.getElementById('rcmbx'+mbox);
+
+ if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
{
- item = this.gui_objects.mailboxlist.childNodes[n];
+ // set new text
+ text_obj = item.firstChild;
+ reg = /\s+\([0-9]+\)$/i;
- if (item.className && item.className.indexOf('mailbox '+mbox)>=0)
- {
- // set new text
- text_obj = item.firstChild;
- reg = /\s+\([0-9]+\)$/i;
-
- if (count && text_obj.innerHTML.match(reg))
- text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')');
- else if (count)
- text_obj.innerHTML += ' ('+count+')';
- else
- text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
+ if (count && text_obj.innerHTML.match(reg))
+ text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')');
+ else if (count)
+ text_obj.innerHTML += ' ('+count+')';
+ else
+ text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
- // set the right classes
- this.set_classname(item, 'unread', count>0 ? true : false);
- break;
- }
+ // set the right classes
+ this.set_classname(item, 'unread', count>0 ? true : false);
+ }
+
+ // set unread count to window title
+ if (set_title && document.title)
+ {
+ var doc_title = String(document.title);
+ reg = /^\([0-9]+\)\s+/i;
+
+ if (count && doc_title.match(reg))
+ document.title = doc_title.replace(reg, '('+count+') ');
+ else if (count)
+ document.title = '('+count+') '+doc_title;
+ else
+ document.title = doc_title.replace(reg, '');
}
};
@@ -2516,8 +2710,8 @@
console(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);
+ if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript'))
+ eval(request_obj.get_text());
// process the response data according to the sent action
switch (request_obj.__action)
@@ -2527,9 +2721,10 @@
if (this.env.action=='show')
this.command('list');
break;
-
+
case 'list':
- this.enable_command('select-all', 'select-none', this.env.messagecount ? true : false);
+ case 'expunge':
+ this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
break;
}
@@ -2556,7 +2751,14 @@
var d = new Date();
this.http_request('keep-alive', '_t='+d.getTime());
};
+
+ // send periodic request to check for recent messages
+ this.check_for_recent = function()
+ {
+ var d = new Date();
+ this.http_request('check-recent', '_t='+d.getTime());
+ };
/********************************************************/
@@ -2766,9 +2968,6 @@
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)
@@ -2786,6 +2985,15 @@
return this.xmlhttp.getResponseHeader(name);
};
+ this.get_text = function()
+ {
+ return this.xmlhttp.responseText;
+ };
+
+ this.get_xml = function()
+ {
+ return this.xmlhttp.responseXML;
+ };
this.reset();
--
Gitblit v1.9.1