LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) Handling of cards with unexpected UID 

Fixes #3239
Fixes #3245
pull/89/head
Francis Lachapelle 2015-06-11 12:03:11 -04:00
parent 5435c2dd04
commit 76196bf6f4
3 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -12,6 +12,7 @@ Bug fixes
- properly escape folder after creation using EAS (#3237) - properly escape folder after creation using EAS (#3237)
- fixed potential organizer highjacking when using EAS (#3131) - fixed potential organizer highjacking when using EAS (#3131)
- properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082) - properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082)
- properly encode id of DOM elements in Address Book module (#3239, #3245)
2.3.0 (2015-06-01) 2.3.0 (2015-06-01)
------------------- -------------------

10
UI/Templates/ContactsUI/UIxContactFoldersView.wox
View File

@ -149,11 +149,11 @@
<var:foreach list="personalContactInfos" item="currentContact"> <var:foreach list="personalContactInfos" item="currentContact">
<tr var:class="currentContactClasses" <tr var:class="currentContactClasses"
var:categories="currentContact.c_categories" var:categories="currentContact.c_categories.asSafeJSString"
var:id="currentContact.c_name" var:id="currentContact.c_name.asCSSIdentifier"
var:contactname="currentContact.c_cn"> var:contactname="currentContact.c_cn.asSafeJSString">
<td class="displayName" var:title="currentContact.c_cn"><var:string value="currentContact.c_cn" const:escapeHTML="YES" /></td> <td class="displayName" var:title="currentContact.c_cn.asSafeJSString"><var:string value="currentContact.c_cn" const:escapeHTML="YES" /></td>
<td var:title="currentContact.c_mail"><var:string value="currentContact.c_mail"/></td> <td var:title="currentContact.c_mail.asSafeJSString"><var:string value="currentContact.c_mail"/></td>
<td><var:string value="currentContact.c_screenname"/></td> <td><var:string value="currentContact.c_screenname"/></td>
<td><var:string value="currentContact.c_o"/></td> <td><var:string value="currentContact.c_o"/></td>
<td><var:string value="currentContact.c_telephonenumber"/></td> <td><var:string value="currentContact.c_telephonenumber"/></td>

82
UI/WebServerResources/ContactsUI.js
View File

@ -31,7 +31,7 @@ function openContactsFolder(contactsFolder, reload, idx) {
var selection; var selection;
if (idx) { if (idx) {
selection = [idx]; selection = [idx.asCSSIdentifier()];
} }
else if (contactsFolder == Contact.currentAddressBook) { else if (contactsFolder == Contact.currentAddressBook) {
var contactsList = $("contactsList"); var contactsList = $("contactsList");
@ -74,7 +74,7 @@ function contactsListCallback(http) {
var contact = data[i]; var contact = data[i];
var row = rows[i]; var row = rows[i];
row.className = contact["c_component"]; row.className = contact["c_component"];
row.setAttribute("id", contact["c_name"]); row.setAttribute("id", contact["c_name"].asCSSIdentifier());
row.setAttribute("categories", contact["c_categories"]); row.setAttribute("categories", contact["c_categories"]);
row.setAttribute("contactname", contact["c_cn"]); row.setAttribute("contactname", contact["c_cn"]);
var cells = row.getElementsByTagName("TD"); var cells = row.getElementsByTagName("TD");
@ -111,7 +111,7 @@ function contactsListCallback(http) {
for (var j = i; j < data.length; j++) { for (var j = i; j < data.length; j++) {
var contact = data[j]; var contact = data[j];
var row = createElement("tr", var row = createElement("tr",
contact["c_name"], contact["c_name"].asCSSIdentifier(),
contact["c_component"], contact["c_component"],
null, null,
{ categories: contact["c_categories"], { categories: contact["c_categories"],
@ -272,7 +272,7 @@ function _onContactMenuAction(folderItem, action, refresh) {
if (Object.isArray(document.menuTarget) && selectedFolders.length > 0) { if (Object.isArray(document.menuTarget) && selectedFolders.length > 0) {
var selectedFolderId = $(selectedFolders[0]).readAttribute("id"); var selectedFolderId = $(selectedFolders[0]).readAttribute("id");
var contactIds = $(document.menuTarget).collect(function(row) { var contactIds = $(document.menuTarget).collect(function(row) {
return row.getAttribute("id"); return row.getAttribute("id").fromCSSIdentifier();
}); });
for (var i = 0; i < contactIds.length; i++) { for (var i = 0; i < contactIds.length; i++) {
@ -283,9 +283,7 @@ function _onContactMenuAction(folderItem, action, refresh) {
} }
var url = ApplicationBaseURL + "/" + selectedFolderId + "/" + action; var url = ApplicationBaseURL + "/" + selectedFolderId + "/" + action;
var uids = contactIds.collect(function (s) { var uids = contactIds.collect(encodeURIComponent).join('&uid=');
return encodeURIComponent(s.unescapeHTML());
}).join('&uid=');
if (refresh) if (refresh)
triggerAjaxRequest(url, actionContactCallback, selectedFolderId, triggerAjaxRequest(url, actionContactCallback, selectedFolderId,
('folder='+ folderId + '&uid=' + uids), ('folder='+ folderId + '&uid=' + uids),
@ -312,22 +310,22 @@ function onMenuExportContact (event) {
if (canExport) { if (canExport) {
var selectedFolderId = $(selectedFolders[0]).readAttribute("id"); var selectedFolderId = $(selectedFolders[0]).readAttribute("id");
var contactIds = document.menuTarget.collect(function(row) { var contactIds = document.menuTarget.collect(function(row) {
return row.readAttribute("id"); return row.readAttribute("id").fromCSSIdentifier();
}); });
var url = ApplicationBaseURL + "/" + selectedFolderId + "/export" var url = ApplicationBaseURL + "/" + selectedFolderId + "/export"
+ "?uid=" + contactIds.join("&uid="); + "?uid=" + contactIds.collect(encodeURIComponent).join("&uid=");
window.location.href = url; window.location.href = url;
} }
} }
function onMenuRawContact (event) { function onMenuRawContact (event) {
var cname = document.menuTarget.collect(function(row) { var cname = document.menuTarget.collect(function(row) {
return row.readAttribute("id"); return row.readAttribute("id").fromCSSIdentifier();
}); });
$(function() { $(function() {
openGenericWindow(URLForFolderID(Contact.currentAddressBook) openGenericWindow(URLForFolderID(Contact.currentAddressBook)
+ "/" + cname + "/raw"); + "/" + encodeURIComponent(cname) + "/raw");
}).delay(0.1); }).delay(0.1);
} }
@ -350,22 +348,22 @@ function actionContactCallback(http) {
} }
} }
function loadContact(idx) { function loadContact(cname) {
if (document.contactAjaxRequest) { if (document.contactAjaxRequest) {
document.contactAjaxRequest.aborted = true; document.contactAjaxRequest.aborted = true;
document.contactAjaxRequest.abort(); document.contactAjaxRequest.abort();
} }
if (cachedContacts[Contact.currentAddressBook + "/" + idx]) { if (cachedContacts[Contact.currentAddressBook + "/" + cname]) {
var div = $('contactView'); var div = $('contactView');
Contact.currentContactId = idx; Contact.currentContactId = cname;
div.innerHTML = cachedContacts[Contact.currentAddressBook + "/" + idx]; div.innerHTML = cachedContacts[Contact.currentAddressBook + "/" + cname];
} }
else { else {
var url = (URLForFolderID(Contact.currentAddressBook) var url = (URLForFolderID(Contact.currentAddressBook)
+ "/" + encodeURIComponent(idx.unescapeHTML()) + "/view?noframe=1"); + "/" + encodeURIComponent(cname) + "/view?noframe=1");
document.contactAjaxRequest document.contactAjaxRequest
= triggerAjaxRequest(url, contactLoadCallback, idx); = triggerAjaxRequest(url, contactLoadCallback, cname);
} }
} }
@ -418,8 +416,9 @@ function moveTo(uri) {
/* contact menu entries */ /* contact menu entries */
function onContactRowDblClick(event) { function onContactRowDblClick(event) {
var t = getTarget(event); var t = getTarget(event);
var cname = t.parentNode.getAttribute('id'); var cname = t.parentNode.getAttribute('id').fromCSSIdentifier();
cname = encodeURIComponent(cname);
openContactWindow(URLForFolderID(Contact.currentAddressBook) openContactWindow(URLForFolderID(Contact.currentAddressBook)
+ "/" + cname + "/edit", cname); + "/" + cname + "/edit", cname);
@ -438,7 +437,7 @@ function onContactSelectionChange(event) {
if (rows.length == 1) { if (rows.length == 1) {
var node = $(rows[0]); var node = $(rows[0]);
loadContact(node.getAttribute('id')); loadContact(node.getAttribute('id').fromCSSIdentifier());
} }
else if (rows.length > 1) { else if (rows.length > 1) {
$('contactView').update(); $('contactView').update();
@ -479,8 +478,9 @@ function onToolbarEditSelectedContacts(event) {
} }
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
var id = encodeURIComponent(rows[i].fromCSSIdentifier());
openContactWindow(URLForFolderID(Contact.currentAddressBook) openContactWindow(URLForFolderID(Contact.currentAddressBook)
+ "/" + rows[i] + "/edit", rows[i]); + "/" + id + "/edit", rows[i]);
} }
return false; return false;
@ -488,16 +488,17 @@ function onToolbarEditSelectedContacts(event) {
function onToolbarWriteToSelectedContacts(event) { function onToolbarWriteToSelectedContacts(event) {
var contactsList = $('contactsList'); var contactsList = $('contactsList');
var rows = contactsList.getSelectedRowsId(); var rowIds = contactsList.getSelectedRowsId();
var rowsWithEmail = 0;
if (rows.length == 0) { if (rowIds.length == 0) {
showAlertDialog(_("Please select a contact.")); showAlertDialog(_("Please select a contact."));
} }
else { else {
openMailComposeWindow(ApplicationBaseURL + "/../Mail/compose" openMailComposeWindow(ApplicationBaseURL + "/../Mail/compose"
+ "?folder=" + Contact.currentAddressBook.substring(1) + "?folder=" + Contact.currentAddressBook.substring(1)
+ "&uid=" + rows.join("&uid=")); + "&uid=" + rowIds.collect(function(id) {
return encodeURIComponent(id.fromCSSIdentifier());
}).join("&uid="));
if (document.body.hasClassName("popup")) if (document.body.hasClassName("popup"))
window.close(); window.close();
} }
@ -524,26 +525,28 @@ function onToolbarDeleteSelectedContactsConfirm(dialogId) {
var contactsList = $('contactsList'); var contactsList = $('contactsList');
var rowIds = contactsList.getSelectedRowsId(); var rowIds = contactsList.getSelectedRowsId();
var urlstr = (URLForFolderID(Contact.currentAddressBook) + "/batchDelete"); var urlstr = (URLForFolderID(Contact.currentAddressBook) + "/batchDelete");
for (var i = 0; i < rowIds.length; i++) for (var i = 0; i < rowIds.length; i++)
$(rowIds[i]).hide(); $(rowIds[i]).hide();
triggerAjaxRequest(urlstr, onContactDeleteEventCallback, rowIds, triggerAjaxRequest(urlstr, onContactDeleteEventCallback, rowIds,
('ids=' + rowIds.collect(function (s) { ('ids=' + rowIds.collect(function(id) {
return encodeURIComponent(s.unescapeHTML()); return encodeURIComponent(id.fromCSSIdentifier());
}).join(",")), }).join(",")),
{ "Content-type": "application/x-www-form-urlencoded" }); { "Content-type": "application/x-www-form-urlencoded" });
} }
function onContactDeleteEventCallback(http) { function onContactDeleteEventCallback(http) {
var rowIds = http.callbackData;
if (http.readyState == 4) { if (http.readyState == 4) {
if (isHttpStatus204(http.status)) { if (isHttpStatus204(http.status)) {
var rowIds = http.callbackData;
var row; var row;
var nextRow = null; var nextRow = null;
for (var i = 0; i < rowIds.length; i++) { for (var i = 0; i < rowIds.length; i++) {
delete cachedContacts[Contact.currentAddressBook + "/" + rowIds[i]]; var id = rowIds[i].fromCSSIdentifier();
delete cachedContacts[Contact.currentAddressBook + "/" + id];
row = $(rowIds[i]); row = $(rowIds[i]);
var displayName = row.readAttribute("contactname"); var displayName = row.readAttribute("contactname");
if (Contact.currentContactId == row) { if (Contact.currentContactId == id) {
Contact.currentContactId = null; Contact.currentContactId = null;
} }
var nextRow = row.next("tr"); var nextRow = row.next("tr");
@ -555,7 +558,7 @@ function onContactDeleteEventCallback(http) {
} }
} }
if (nextRow) { if (nextRow) {
Contact.currentContactId = nextRow.getAttribute("id"); Contact.currentContactId = nextRow.getAttribute("id").fromCSSIdentifier();
nextRow.selectElement(); nextRow.selectElement();
loadContact(Contact.currentContactId); loadContact(Contact.currentContactId);
} }
@ -670,7 +673,7 @@ function onConfirmContactSelection(event) {
var contactsList = $("contactsList"); var contactsList = $("contactsList");
var rows = contactsList.getSelectedRows(); var rows = contactsList.getSelectedRows();
for (i = 0; i < rows.length; i++) { for (i = 0; i < rows.length; i++) {
var cid = rows[i].getAttribute("id"); var cid = rows[i].getAttribute("id").fromCSSIdentifier();
if (cid.endsWith(".vlf")) { if (cid.endsWith(".vlf")) {
addListToOpener(tag, Contact.currentAddressBook, currentAddressBookName, cid); addListToOpener(tag, Contact.currentAddressBook, currentAddressBookName, cid);
} }
@ -1295,7 +1298,7 @@ function onDocumentKeydown(event) {
else if (keyCode == Event.KEY_DOWN || else if (keyCode == Event.KEY_DOWN ||
keyCode == Event.KEY_UP) { keyCode == Event.KEY_UP) {
if (Contact.currentContactId) { if (Contact.currentContactId) {
var row = $(Contact.currentContactId); var row = $(Contact.currentContactId.asCSSIdentifier());
var nextRow; var nextRow;
if (keyCode == Event.KEY_DOWN) if (keyCode == Event.KEY_DOWN)
nextRow = row.next("tr"); nextRow = row.next("tr");
@ -1319,7 +1322,7 @@ function onDocumentKeydown(event) {
// Select and load the next message // Select and load the next message
nextRow.selectElement(); nextRow.selectElement();
loadContact(nextRow.readAttribute("id")); loadContact(nextRow.readAttribute("id").fromCSSIdentifier());
} }
Event.stop(event); Event.stop(event);
} }
@ -1465,11 +1468,12 @@ function onCategoriesMenuItemClick() {
var rowIds = contactsList.getSelectedRowsId(); var rowIds = contactsList.getSelectedRowsId();
if (rowIds.length > 0) { if (rowIds.length > 0) {
for (var i = 0; i < rowIds.length; i++) { for (var i = 0; i < rowIds.length; i++) {
var id = rowIds[i].fromCSSIdentifier();
var url = (URLForFolderID(Contact.currentAddressBook) var url = (URLForFolderID(Contact.currentAddressBook)
+ "/" + rowIds[i] + "/" + method); + "/" + encodeURIComponent(id) + "/" + method);
url += "?category=" + encodeURIComponent(this.category); url += "?category=" + encodeURIComponent(this.category);
triggerAjaxRequest(url, onCategoriesMenuItemCallback, triggerAjaxRequest(url, onCategoriesMenuItemCallback,
{ 'addressBook' : Contact.currentAddressBook, 'id' : rowIds[i] }); { 'addressBook' : Contact.currentAddressBook, 'id' : id });
if (set) { if (set) {
setCategoryOnNode($(rowIds[i]), this.category); setCategoryOnNode($(rowIds[i]), this.category);
} }
@ -1497,7 +1501,7 @@ function onCategoriesMenuItemCallback(http) {
function setCategoryOnNode(contactNode, category) { function setCategoryOnNode(contactNode, category) {
var catList = contactNode.getAttribute("categories"); var catList = contactNode.getAttribute("categories");
var catsArray = catList.split(","); var catsArray = catList? catList.split(",") : [];
if (catsArray.indexOf(category) == -1) { if (catsArray.indexOf(category) == -1) {
catsArray.push(category); catsArray.push(category);
contactNode.setAttribute("categories", catsArray.join(",")); contactNode.setAttribute("categories", catsArray.join(","));
@ -1607,9 +1611,9 @@ function dropSelectedContacts(action, toId) {
if ((!currentFolderIsRemote() || action != "move") if ((!currentFolderIsRemote() || action != "move")
&& fromId.substring(1) != toId) { && fromId.substring(1) != toId) {
var url = ApplicationBaseURL + "/" + fromId + "/" + action; var url = ApplicationBaseURL + fromId + "/" + action;
var uids = contactIds.collect(function (s) { var uids = contactIds.collect(function(id) {
return encodeURIComponent(s.unescapeHTML()); return encodeURIComponent(id.fromCSSIdentifier());
}).join('&uid='); }).join('&uid=');
triggerAjaxRequest(url, actionContactCallback, fromId, triggerAjaxRequest(url, actionContactCallback, fromId,
('folder='+ toId + '&uid=' + uids), ('folder='+ toId + '&uid=' + uids),