From 3ac95d5a673db544d7ceeaa9e5fca766cb738120 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 28 Jul 2008 02:43:02 -0400
Subject: [PATCH] #1485230: allow only images (by filename extension) in tinyMCE's images selector
---
program/js/app.js | 364 +++++++++++++++++++++++++++++++++------------------
1 files changed, 234 insertions(+), 130 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 8393eca..20c561a 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -136,7 +136,7 @@
this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
this.message_list.init();
- this.enable_command('toggle_status', true);
+ this.enable_command('toggle_status', 'toggle_flag', true);
if (this.gui_objects.mailcontframe)
{
@@ -185,7 +185,7 @@
{
if (this.gui_objects.remoteobjectsmsg)
this.gui_objects.remoteobjectsmsg.style.display = 'block';
- this.enable_command('load-images', true);
+ this.enable_command('load-images', 'always-load', true);
}
if (this.env.action=='compose')
@@ -203,7 +203,10 @@
if (this.env.messagecount)
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))
+ if (this.env.messagecount
+ && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))))
this.enable_command('purge', true);
this.set_page_buttons();
@@ -370,6 +373,7 @@
row.deleted = this.env.messages[uid].deleted ? true : false;
row.unread = this.env.messages[uid].unread ? true : false;
row.replied = this.env.messages[uid].replied ? true : false;
+ row.flagged = this.env.messages[uid].flagged ? true : false;
}
// set eventhandler to message icon
@@ -379,6 +383,24 @@
row.icon.id = 'msgicn_'+row.uid;
row.icon._row = row.obj;
row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
+ }
+
+ // global variable 'flagged_col' may be not defined yet
+ if (!this.env.flagged_col && this.env.coltypes)
+ {
+ var found;
+ if((found = find_in_array('flag', this.env.coltypes)) >= 0)
+ this.set_env('flagged_col', found+1);
+ }
+
+ // set eventhandler to flag icon, if icon found
+ if (this.env.flagged_col && (row.flagged_icon = row.obj.cells[this.env.flagged_col].childNodes[0])
+ && row.flagged_icon.nodeName=='IMG')
+ {
+ var p = this;
+ row.flagged_icon.id = 'flaggedicn_'+row.uid;
+ row.flagged_icon._row = row.obj;
+ row.flagged_icon.onmousedown = function(e) { p.command('toggle_flag', this); };
}
};
@@ -405,7 +427,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);
@@ -630,7 +652,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();
@@ -705,6 +727,31 @@
this.mark_message(flag, uid);
break;
+ case 'toggle_flag':
+ if (props && !props._row)
+ break;
+
+ var uid;
+ var flag = 'flagged';
+
+ if (props._row.uid)
+ {
+ uid = props._row.uid;
+ this.message_list.dont_select = true;
+ // toggle flagged/unflagged
+ if (this.message_list.rows[uid].flagged)
+ flag = 'unflagged';
+ }
+ this.mark_message(flag, uid);
+ break;
+
+ case 'always-load':
+ if (this.env.uid && this.env.sender) {
+ this.add_contact(urlencode(this.env.sender));
+ window.setTimeout(function(){ ref.command('load-images'); }, 300);
+ break;
+ }
+
case 'load-images':
if (this.env.uid)
this.show_message(this.env.uid, true, this.env.action=='preview');
@@ -721,7 +768,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;
}
}
@@ -889,7 +936,7 @@
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);
}
@@ -902,7 +949,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;
@@ -1019,7 +1066,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);
};
@@ -1138,7 +1185,7 @@
// start timer for message preview (wait for double click)
if (selected && this.env.contentframe && !list.multi_selecting)
- this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
+ this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
else if (this.env.contentframe)
this.show_contentframe(false);
};
@@ -1232,9 +1279,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';
}
@@ -1394,13 +1444,13 @@
lock = true;
this.set_busy(true, 'movingmessage');
}
- else
+ else if (!this.env.flag_for_deletion)
this.show_contentframe(false);
// 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._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true));
};
// delete selected messages from the current mailbox
@@ -1450,12 +1500,12 @@
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();
@@ -1464,13 +1514,28 @@
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;
+ }
}
}
@@ -1498,7 +1563,7 @@
{
for (var n=0; n<selection.length; n++)
{
- a_uids[a_uids.length] = selection[n];
+ a_uids[a_uids.length] = selection[n];
}
}
@@ -1510,8 +1575,10 @@
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))
+ || (flag=='delete' && !this.message_list.rows[id].deleted)
+ || (flag=='undelete' && this.message_list.rows[id].deleted)
+ || (flag=='flagged' && !this.message_list.rows[id].flagged)
+ || (flag=='unflagged' && this.message_list.rows[id].flagged))
{
r_uids[r_uids.length] = id;
}
@@ -1530,6 +1597,10 @@
case 'delete':
case 'undelete':
this.toggle_delete_status(r_uids);
+ break;
+ case 'flagged':
+ case 'unflagged':
+ this.toggle_flagged_status(flag, a_uids);
break;
}
};
@@ -1597,6 +1668,32 @@
}
}
+
+ // set image to flagged or unflagged
+ this.toggle_flagged_status = function(flag, a_uids)
+ {
+ // mark all message rows as flagged/unflagged
+ var icn_src;
+ var rows = this.message_list.rows;
+ for (var i=0; i<a_uids.length; i++)
+ {
+ uid = a_uids[i];
+ if (rows[uid])
+ {
+ rows[uid].flagged = (flag=='flagged' ? true : false);
+
+ if (rows[uid].flagged && this.env.flaggedicon)
+ icn_src = this.env.flaggedicon;
+ else if (this.env.unflaggedicon)
+ icn_src = this.env.unflaggedicon;
+
+ if (rows[uid].flagged_icon && icn_src)
+ rows[uid].flagged_icon.src = icn_src;
+ }
+ }
+
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ };
// mark all message rows as deleted/undeleted
this.toggle_delete_status = function(a_uids)
@@ -1792,9 +1889,18 @@
}
// check for empty body
- if ((input_message.value == '' && (!window.tinyMCE || tinyMCE.getContent() == '')) && !confirm(this.get_label('nobodywarning')))
+ if ((!window.tinyMCE || !tinyMCE.get('compose-body'))
+ && input_message.value == ''
+ && !confirm(this.get_label('nobodywarning')))
{
input_message.focus();
+ return false;
+ }
+ else if (window.tinyMCE && tinyMCE.get('compose-body')
+ && !tinyMCE.get('compose-body').getContent()
+ && !confirm(this.get_label('nobodywarning')))
+ {
+ tinyMCE.get('compose-body').focus();
return false;
}
@@ -1830,12 +1936,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)
@@ -1844,8 +1950,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;
@@ -1898,11 +2010,6 @@
else
{
var editor = tinyMCE.get('compose-body');
- // if this is null, we should exit
- if (editor == null)
- {
- return false;
- }
if (this.env.signatures && this.env.signatures[id])
{
@@ -1988,7 +2095,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);
@@ -1997,8 +2104,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);
}
@@ -2163,26 +2271,10 @@
}
// 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;
- };
-
-
- // handler for mouse events on address-fields
- this.ksearch_onmousemove = function(li)
- {
- var last = document.getElementById('rcmksearchSelected');
- if (last)
- {
- last.removeAttribute('id');
- this.set_classname(last, 'selected', false);
- }
-
- li.setAttribute('id', 'rcmksearchSelected');
- this.set_classname(li, 'selected', true);
- this.ksearch_selected = li._rcm_id;
};
@@ -2206,7 +2298,6 @@
cpos = p+insert.length;
if (this.ksearch_input.setSelectionRange)
this.ksearch_input.setSelectionRange(cpos, cpos);
-
};
@@ -2275,9 +2366,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.onmouseover = function(e){ ref.ksearch_onmousemove(this); };
- li.style.cursor = 'pointer';
li._rcm_id = a_result_ids[i];
ul.appendChild(li);
}
@@ -2355,7 +2443,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);
@@ -2496,7 +2584,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;
};
@@ -2594,12 +2682,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);
@@ -2631,8 +2720,7 @@
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);
@@ -2666,12 +2754,20 @@
var form;
if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
+ {
name = form.elements['_folder_name'].value;
- if (this.env.folder && name != '')
- 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();
};
@@ -2684,20 +2780,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); };
@@ -2716,11 +2812,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;
};
@@ -2737,9 +2831,16 @@
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));
+
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true);
}
}
// escape
@@ -2763,20 +2864,19 @@
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;
@@ -2800,14 +2900,18 @@
// 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;
@@ -2831,7 +2935,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);
@@ -2842,13 +2945,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;
@@ -2867,7 +2970,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)
@@ -2876,7 +2979,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;
@@ -2943,32 +3046,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 *********/
@@ -2992,7 +3069,7 @@
var button, obj;
if(!a_buttons || !a_buttons.length)
- return;
+ return false;
for(var n=0; n<a_buttons.length; n++)
{
@@ -3060,7 +3137,7 @@
var button, img;
if(!a_buttons || !a_buttons.length)
- return;
+ return false;
for(var n=0; n<a_buttons.length; n++)
{
@@ -3072,6 +3149,7 @@
img.src = button.over;
}
}
+
};
// mouse down on button
@@ -3167,7 +3245,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);
};
@@ -3241,9 +3319,12 @@
cell.id = 'rcmHead'+col;
}
-
- if (col == 'subject' && this.message_list)
+ else if (col == 'subject' && this.message_list)
this.message_list.subject_col = n+1;
+ else if (col == 'flag' && this.env.unflaggedicon)
+ {
+ cell.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
+ }
}
};
@@ -3259,7 +3340,8 @@
this.env.messages[uid] = {deleted:flags.deleted?1:0,
replied:flags.replied?1:0,
- unread:flags.unread?1:0};
+ unread:flags.unread?1:0,
+ flagged:flags.flagged?1:0};
var row = document.createElement('TR');
row.id = 'rcmrow'+uid;
@@ -3274,7 +3356,7 @@
var col = document.createElement('TD');
col.className = 'icon';
- col.innerHTML = icon ? '<img src="'+icon+'" alt="" border="0" />' : '';
+ col.innerHTML = icon ? '<img src="'+icon+'" alt="" />' : '';
row.appendChild(col);
// add each submitted col
@@ -3283,13 +3365,23 @@
var c = this.coltypes[n];
col = document.createElement('TD');
col.className = String(c).toLowerCase();
- col.innerHTML = cols[c];
+
+ if (c=='flag')
+ {
+ if (flags.flagged && this.env.flaggedicon)
+ col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
+ else if(this.env.unflaggedicon)
+ col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
+ }
+ else
+ col.innerHTML = cols[c];
+
row.appendChild(col);
}
col = document.createElement('TD');
col.className = 'icon';
- col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : '';
+ col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '';
row.appendChild(col);
this.message_list.insert_row(row, attop);
@@ -3405,6 +3497,14 @@
tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
}
};
+
+
+ this.toggle_prefer_html = function(checkbox)
+ {
+ var addrbook_show_images;
+ if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
+ addrbook_show_images.disabled = !checkbox.checked;
+ }
@@ -3552,7 +3652,11 @@
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)));
+ var mailboxtest = (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))) ? true : false;
+
+ this.enable_command('purge', (this.env.messagecount && mailboxtest));
break;
@@ -3832,7 +3936,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