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

Fix JavaScript exception in Contacts module 

Fixed calling unescapeHTML on null variables. Also fixed errors on IE7
(and possibly other versions).
pull/30/head
Francis Lachapelle 2014-03-24 12:43:34 -04:00
parent 50e7ea7188
commit e5fb7dc7b8
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@
Bug fixes Bug fixes
- fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2678) - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2678)
- fixed calling unescapeHTML on null variables to avoid JavaScript exceptions in Contacts module
2.2.2 (2014-03-21) 2.2.2 (2014-03-21)
------------------ ------------------

46
UI/WebServerResources/ContactsUI.js
View File

@ -76,14 +76,32 @@ function contactsListCallback(http) {
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");
$(cells[0]).update(contact["c_cn"].escapeHTML()); if (contact["c_cn"])
$(cells[0]).update(contact["c_cn"].escapeHTML());
else
$(cells[0]).update();
cells[0].title = contact["c_cn"]; cells[0].title = contact["c_cn"];
$(cells[1]).update(contact["c_mail"].escapeHTML()); log('mail ' + contact["c_mail"]);
if (contact["c_mail"])
$(cells[1]).update(contact["c_mail"].escapeHTML());
else
$(cells[1]).update();
cells[1].title = contact["c_mail"]; cells[1].title = contact["c_mail"];
if (fullView) { if (fullView) {
$(cells[2]).update(contact["c_screenname"].escapeHTML()); if (contact["c_screenname"])
$(cells[3]).update(contact["c_o"].escapeHTML()); $(cells[2]).update(contact["c_screenname"].escapeHTML());
$(cells[4]).update(contact["c_telephonenumber"].escapeHTML()); else
$(cells[2]).update();
if (contact["c_o"])
$(cells[3]).update(contact["c_o"].escapeHTML());
else
$(cells[3]).update();
if (contact["c_telephonenumber"])
$(cells[4]).update(contact["c_telephonenumber"].escapeHTML());
else
$(cells[4]).update();
} }
} }
@ -103,13 +121,17 @@ function contactsListCallback(http) {
null, null,
null, null,
row); row);
cell.update(contact["c_cn"].escapeHTML());
cell.title = contact["c_cn"]; if (contact["c_cn"]) {
$(cell).update(contact["c_cn"].escapeHTML());
cell.title = contact["c_cn"];
}
cell = document.createElement("td"); cell = document.createElement("td");
row.appendChild(cell); row.appendChild(cell);
if (contact["c_mail"]) { if (contact["c_mail"]) {
cell.update(contact["c_mail"].escapeHTML()); $(cell).update(contact["c_mail"].escapeHTML());
cell.title = contact["c_mail"]; cell.title = contact["c_mail"];
} }
@ -117,17 +139,17 @@ function contactsListCallback(http) {
cell = document.createElement("td"); cell = document.createElement("td");
row.appendChild(cell); row.appendChild(cell);
if (contact["c_screenname"]) if (contact["c_screenname"])
cell.update(contact["c_screenname"].escapeHTML()); $(cell).update(contact["c_screenname"].escapeHTML());
cell = document.createElement("td"); cell = document.createElement("td");
row.appendChild(cell); row.appendChild(cell);
if (contact["c_o"]) if (contact["c_o"])
cell.update(contact["c_o"].escapeHTML()); $(cell).update(contact["c_o"].escapeHTML());
cell = document.createElement("td"); cell = document.createElement("td");
row.appendChild(cell); row.appendChild(cell);
if (contact["c_telephonenumber"]) if (contact["c_telephonenumber"])
cell.update(contact["c_telephonenumber"].escapeHTML()); $(cell).update(contact["c_telephonenumber"].escapeHTML());
} }
} }
} }
@ -136,7 +158,7 @@ function contactsListCallback(http) {
for (i = rows.length - 1; i >= data.length; i--) { for (i = rows.length - 1; i >= data.length; i--) {
tbody.removeChild(rows[i]); tbody.removeChild(rows[i]);
} }
if (sorting["attribute"] && sorting["attribute"].length > 0) { if (sorting["attribute"] && sorting["attribute"].length > 0) {
var sortHeader; var sortHeader;
if (sorting["attribute"] == "c_cn") if (sorting["attribute"] == "c_cn")