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

Calendar: optimize sending calendar events, also enabled caching of result

This commit is contained in:
Bart Visscher 2012-02-17 21:39:54 +01:00
parent a33b757b19
commit 539fd7240c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,8 @@
require_once ('../../../lib/base.php'); require_once ('../../../lib/base.php');
require_once('../../../3rdparty/when/When.php'); require_once('../../../3rdparty/when/When.php');
function addoutput($event, $vevent, $return_event){ function create_return_event($event, $vevent){
$return_event = array();
$return_event['id'] = (int)$event['id']; $return_event['id'] = (int)$event['id'];
$return_event['title'] = htmlspecialchars($event['summary']); $return_event['title'] = htmlspecialchars($event['summary']);
$return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):''; $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
@ -29,15 +30,21 @@ OC_JSON::checkAppEnabled('calendar');
$start = DateTime::createFromFormat('U', $_GET['start']); $start = DateTime::createFromFormat('U', $_GET['start']);
$end = DateTime::createFromFormat('U', $_GET['end']); $end = DateTime::createFromFormat('U', $_GET['end']);
$calendar = OC_Calendar_App::getCalendar($_GET['calendar_id']);
OC_Response::enableCaching(0);
OC_Response::setETagHeader($calendar['ctag']);
$events = OC_Calendar_Object::allInPeriod($_GET['calendar_id'], $start, $end); $events = OC_Calendar_Object::allInPeriod($_GET['calendar_id'], $start, $end);
$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get()); $user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
$return = array(); $return = array();
foreach($events as $event){ foreach($events as $event){
$object = OC_VObject::parse($event['calendardata']); $object = OC_VObject::parse($event['calendardata']);
$vevent = $object->VEVENT; $vevent = $object->VEVENT;
$return_event = create_return_event($event, $vevent);
$dtstart = $vevent->DTSTART; $dtstart = $vevent->DTSTART;
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
$return_event = array();
$start_dt = $dtstart->getDateTime(); $start_dt = $dtstart->getDateTime();
$end_dt = $dtend->getDateTime(); $end_dt = $dtend->getDateTime();
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){ if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
@ -47,13 +54,17 @@ foreach($events as $event){
$start_dt->setTimezone(new DateTimeZone($user_timezone)); $start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt->setTimezone(new DateTimeZone($user_timezone)); $end_dt->setTimezone(new DateTimeZone($user_timezone));
} }
//Repeating Events //Repeating Events
if($event['repeating'] == 1){ if($event['repeating'] == 1){
$duration = (double) $end_dt->format('U') - (double) $start_dt->format('U'); $duration = (double) $end_dt->format('U') - (double) $start_dt->format('U');
$r = new When(); $r = new When();
$r->recur((string) $start_dt->format('Ymd\THis'))->rrule((string) $vevent->RRULE); $r->recur($start_dt)->rrule((string) $vevent->RRULE);
while($result = $r->next()){ while($result = $r->next()){
if($result->format('U') > $_GET['end']){ if($result < $start){
continue;
}
if($result > $end){
break; break;
} }
if($return_event['allDay'] == true){ if($return_event['allDay'] == true){
@ -63,21 +74,18 @@ foreach($events as $event){
$return_event['start'] = $result->format('Y-m-d H:i:s'); $return_event['start'] = $result->format('Y-m-d H:i:s');
$return_event['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration); $return_event['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
} }
$return[] = addoutput($event, $vevent, $return_event); $return[] = $return_event;
} }
}else{ }else{
$return_event = array(); if($return_event['allDay'] == true){
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
$return_event['allDay'] = true;
$return_event['start'] = $start_dt->format('Y-m-d'); $return_event['start'] = $start_dt->format('Y-m-d');
$end_dt->modify('-1 sec'); $end_dt->modify('-1 sec');
$return_event['end'] = $end_dt->format('Y-m-d'); $return_event['end'] = $end_dt->format('Y-m-d');
}else{ }else{
$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;
} }
$return[] = addoutput($event, $vevent, $return_event); $return[] = $return_event;
} }
} }
OC_JSON::encodedPrint($return); OC_JSON::encodedPrint($return);

1
apps/calendar/lib/calendar.php
View File

@ -246,6 +246,7 @@ class OC_Calendar_Calendar{
'backgroundColor' => '#'.$calendar['calendarcolor'], 'backgroundColor' => '#'.$calendar['calendarcolor'],
'borderColor' => '#888', 'borderColor' => '#888',
'textColor' => 'black', 'textColor' => 'black',
'cache' => true,
); );
} }
} }