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

Fix encoding of calendar names in Web interface

pull/3/head
Francis Lachapelle 2014-09-17 09:45:44 -04:00
parent ce1896b627
commit 7e281dca99
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/WebServerResources/SchedulerUI.js
View File

@ -925,11 +925,11 @@ function performEventDeletion(folder, event, recurrence) {
function performDeleteEventCallback(http) {
if (http.readyState == 4) {
if (isHttpStatus204(http.status)) {
var occurenceTime = http.callbackData.occurence;
var cname = http.callbackData.cname;
var calendar = http.callbackData.calendar;
_deleteCalendarEventBlocks(calendar, cname, occurenceTime);
_deleteEventFromTables(calendar, cname, occurenceTime);
_deleteCalendarEventCache(calendar, cname, occurenceTime);
@ -1190,7 +1190,7 @@ function tasksListCallback(http) {
var calendar = escape(data[i][1]);
var cname = escape(data[i][0]);
var rTime = data[i][13];
var id = escape(data[i][1] + "-" + data[i][0]);
if (rTime)
@ -3572,7 +3572,7 @@ function appendCalendar(folderName, folderPath) {
li.appendChild(colorBox);
var displayName = document.createElement("span");
displayName.appendChild(document.createTextNode(folderName.escapeHTML()));
displayName.appendChild(document.createTextNode(folderName));
li.appendChild(displayName);
$(colorBox).addClassName("colorBox");
@ -3662,7 +3662,7 @@ function onCalendarRemove(event) {
}
function deletePersonalCalendar(folderElement) {
var displayName = folderElement.childNodesWithTag("span")[0].innerHTML.strip();
var displayName = folderElement.childNodesWithTag("span")[0].innerHTML.strip().unescapeHTML();
showConfirmDialog(_("Confirmation"),
_("Are you sure you want to delete the calendar \"%{0}\"?").formatted(displayName),
deletePersonalCalendarConfirm.bind(folderElement));