rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Encode event title and desc in javascript to avoid double encoding. Fix #205

master
Thomas Tanghus 2012-11-20 01:45:29 +01:00
parent a47983ab47
commit 94465f881a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/events.php
View File

@ -27,4 +27,4 @@ $output = array();
foreach($events as $event) {
$output = array_merge($output, OC_Calendar_App::generateEventOutput($event, $start, $end));
}
OCP\JSON::encodedPrint(OCP\Util::sanitizeHTML($output));
OCP\JSON::encodedPrint($output);

8
js/calendar.js
View File

@ -246,10 +246,10 @@ Calendar={
// Tue 18 October 2011 08:00 - 16:00
}
var html =
'<div class="summary">' + event.title + '</div>' +
'<div class="summary">' + escapeHTML(event.title) + '</div>' +
'<div class="timespan">' + timespan + '</div>';
if (event.description){
html += '<div class="description">' + event.description + '</div>';
html += '<div class="description">' + escapeHTML(event.description) + '</div>';
}
return html;
},
@ -800,7 +800,7 @@ function ListView(element, calendar) {
' class="' + classes.join(' ') + '"' +
'>' +
'<span class="fc-event-title">' +
event.title +
escapeHTML(event.title) +
'</span>' +
'</span>' +
'</td>' +
@ -909,7 +909,7 @@ $(document).ready(function(){
eventDrop: Calendar.UI.moveEvent,
eventResize: Calendar.UI.resizeEvent,
eventRender: function(event, element) {
element.find('.fc-event-title').text($("<div/>").html(event.title).text())
element.find('.fc-event-title').text($("<div/>").html(escapeHTML(event.title)).text())
element.tipsy({
className: 'tipsy-event',
opacity: 0.9,