wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use sanitizeHTML() function

Browse source
This commit is contained in:
Bjoern Schiessle 2012-06-20 15:11:14 +02:00
parent 1ecbf459c9
commit 5a2c93ec2d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/calendar/ajax/events.php
View file

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

2
apps/calendar/js/calendar.js
View file

@ -869,7 +869,7 @@ $(document).ready(function(){
eventDrop: Calendar.UI.moveEvent,
eventResize: Calendar.UI.resizeEvent,
eventRender: function(event, element) {
element.find('.fc-event-title').html(element.find('.fc-event-title').text());
element.find('.fc-event-title').html(element.find('.fc-event-title').html());
element.tipsy({
className: 'tipsy-event',
opacity: 0.9,

6
apps/calendar/lib/object.php
View file

@ -600,8 +600,8 @@ class OC_Calendar_Object{
public static function updateVCalendarFromRequest($request, $vcalendar)
{
$title = strip_tags($request["title"]);
$location = strip_tags($request["location"]);
$title = $request["title"];
$location = $request["location"];
$categories = $request["categories"];
$allday = isset($request["allday"]);
$from = $request["from"];
@ -611,7 +611,7 @@ class OC_Calendar_Object{
$totime = $request['totime'];
}
$vevent = $vcalendar->VEVENT;
$description = strip_tags($request["description"]);
$description = $request["description"];
$repeat = $request["repeat"];
if($repeat != 'doesnotrepeat'){
$rrule = '';