Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix missing events in "Find resources" calendar (Bifrost#T330293)

Browse source 
This was a regression from fullcalendar update. Some code still expected
dates in unix timestamp format, while fullcalendar uses iso format.
This commit is contained in:
Aleksander Machniak 2020-02-17 12:32:22 +01:00
parent 006cb77310
commit 08c4791a79
1 changed files with 36 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
plugins/calendar/calendar.php
View file

@ -1313,20 +1313,11 @@ class calendar extends rcube_plugin
*/ */
function load_events() function load_events()
{ {
$start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET); $start = $this->input_timestamp('start', rcube_utils::INPUT_GET);
$end = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET); $end = $this->input_timestamp('end', rcube_utils::INPUT_GET);
$query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET); $query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET);
$source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET); $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
if (!is_numeric($start) || strpos($start, 'T')) {
$start = new DateTime($start, $this->timezone);
$start = $start->getTimestamp();
}
if (!is_numeric($end) || strpos($end, 'T')) {
$end = new DateTime($end, $this->timezone);
$end = $end->getTimestamp();
}
$events = $this->driver->load_events($start, $end, $query, $source); $events = $this->driver->load_events($start, $end, $query, $source);
echo $this->encode($events, !empty($query)); echo $this->encode($events, !empty($query));
exit; exit;
@ -2282,31 +2273,21 @@ class calendar extends rcube_plugin
public function freebusy_status() public function freebusy_status()
{ {
$email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC); $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
$start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC); $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
$end = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC); $end = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
// convert dates into unix timestamps
if (!empty($start) && !is_numeric($start)) {
$dts = new DateTime($start, $this->timezone);
$start = $dts->format('U');
}
if (!empty($end) && !is_numeric($end)) {
$dte = new DateTime($end, $this->timezone);
$end = $dte->format('U');
}
if (!$start) $start = time(); if (!$start) $start = time();
if (!$end) $end = $start + 3600; if (!$end) $end = $start + 3600;
$fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE'); $fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE');
$status = 'UNKNOWN'; $status = 'UNKNOWN';
// if the backend has free-busy information // if the backend has free-busy information
$fblist = $this->driver->get_freebusy_list($email, $start, $end); $fblist = $this->driver->get_freebusy_list($email, $start, $end);
if (is_array($fblist)) { if (is_array($fblist)) {
$status = 'FREE'; $status = 'FREE';
foreach ($fblist as $slot) { foreach ($fblist as $slot) {
list($from, $to, $type) = $slot; list($from, $to, $type) = $slot;
if ($from < $end && $to > $start) { if ($from < $end && $to > $start) {
@ -2315,14 +2296,14 @@ class calendar extends rcube_plugin
} }
} }
} }
// let this information be cached for 5min // let this information be cached for 5min
$this->rc->output->future_expire_header(300); $this->rc->output->future_expire_header(300);
echo $status; echo $status;
exit; exit;
} }
/** /**
* Return a list of free/busy time slots within the given period * Return a list of free/busy time slots within the given period
* Echo data in JSON encoding * Echo data in JSON encoding
@ -2330,25 +2311,15 @@ class calendar extends rcube_plugin
public function freebusy_times() public function freebusy_times()
{ {
$email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC); $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
$start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC); $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
$end = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC); $end = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
$interval = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC)); $interval = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
$strformat = $interval > 60 ? 'Ymd' : 'YmdHis'; $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
// convert dates into unix timestamps
if (!empty($start) && !is_numeric($start)) {
$dts = rcube_utils::anytodatetime($start, $this->timezone);
$start = $dts ? $dts->format('U') : null;
}
if (!empty($end) && !is_numeric($end)) {
$dte = rcube_utils::anytodatetime($end, $this->timezone);
$end = $dte ? $dte->format('U') : null;
}
if (!$start) $start = time(); if (!$start) $start = time();
if (!$end) $end = $start + 86400 * 30; if (!$end) $end = $start + 86400 * 30;
if (!$interval) $interval = 60; // 1 hour if (!$interval) $interval = 60; // 1 hour
if (!$dte) { if (!$dte) {
$dts = new DateTime('@'.$start); $dts = new DateTime('@'.$start);
$dts->setTimezone($this->timezone); $dts->setTimezone($this->timezone);
@ -2399,13 +2370,13 @@ class calendar extends rcube_plugin
$slots .= $status; $slots .= $status;
$t = $t_end; $t = $t_end;
} }
$dte = new DateTime('@'.$t_end); $dte = new DateTime('@'.$t_end);
$dte->setTimezone($this->timezone); $dte->setTimezone($this->timezone);
// let this information be cached for 5min // let this information be cached for 5min
$this->rc->output->future_expire_header(300); $this->rc->output->future_expire_header(300);
echo rcube_output::json_serialize(array( echo rcube_output::json_serialize(array(
'email' => $email, 'email' => $email,
'start' => $dts->format('c'), 'start' => $dts->format('c'),
@ -2599,10 +2570,11 @@ class calendar extends rcube_plugin
$events = array(); $events = array();
if ($directory = $this->resources_directory()) { if ($directory = $this->resources_directory()) {
$events = $directory->get_resource_calendar( $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC), $start = $this->input_timestamp('start', rcube_utils::INPUT_GET);
rcube_utils::get_input_value('start', rcube_utils::INPUT_GET), $end = $this->input_timestamp('end', rcube_utils::INPUT_GET);
rcube_utils::get_input_value('end', rcube_utils::INPUT_GET));
$events = $directory->get_resource_calendar($id, $start, $end);
} }
echo $this->encode($events); echo $this->encode($events);
@ -3587,6 +3559,21 @@ class calendar extends rcube_plugin
return $recurrence->first_occurrence(); return $recurrence->first_occurrence();
} }
/**
* Get date-time input from UI and convert to unix timestamp
*/
protected function input_timestamp($name, $type)
{
$ts = rcube_utils::get_input_value($name, $type);
if ($ts && (!is_numeric($ts) || strpos($ts, 'T'))) {
$ts = new DateTime($ts, $this->timezone);
$ts = $ts->getTimestamp();
}
return $ts;
}
/** /**
* Magic getter for public access to protected members * Magic getter for public access to protected members
*/ */