mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix allday bug

This commit is contained in:
Georg Ehrke 2011-10-21 22:47:31 +02:00
parent 92fa6f0a48
commit d50b014aba
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/calendar/ajax/events.php
View File

@ -25,23 +25,26 @@ foreach($events as $event)
$dtstart = $vevent->DTSTART; $dtstart = $vevent->DTSTART;
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
$start_dt = $dtstart->getDateTime(); $start_dt = $dtstart->getDateTime();
$start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt = $dtend->getDateTime(); $end_dt = $dtend->getDateTime();
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE)
{
$return_event['allDay'] = true;
$return_event['start'] = $start_dt->format('Y-m-d');
$end_dt->modify('-1 sec');
$return_event['end'] = $end_dt->format('Y-m-d');
}else{
$start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt->setTimezone(new DateTimeZone($user_timezone)); $end_dt->setTimezone(new DateTimeZone($user_timezone));
$return_event['start'] = $start_dt->format('Y-m-d H:i:s');
$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
$return_event['allDay'] = false;
}
$return_event = array(); $return_event = array();
$return_event['id'] = $event['id']; $return_event['id'] = $event['id'];
$return_event['title'] = $event['summary']; $return_event['title'] = $event['summary'];
$return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:''; $return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'';
$return_event['start'] = $start_dt->format('Y-m-d H:i:s'); $return_event['start'] = $start_dt->format('Y-m-d H:i:s');
$return_event['end'] = $end_dt->format('Y-m-d H:i:s'); $return_event['end'] = $end_dt->format('Y-m-d H:i:s');
$return_event['allDay'] = false;
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE)
{
$return_event['allDay'] = true;
$end_dt->modify('-1 sec');
$return_event['end'] = $end_dt->format('Y-m-d H:i:s');
}
$return[] = $return_event; $return[] = $return_event;
} }
OC_JSON::encodedPrint($return); OC_JSON::encodedPrint($return);