beenull/calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

See https://git.kolab.org/rRPKea78b1c2df4f655c571f872e66e489e6ae531d11

Browse source
This commit is contained in:
JodliDev 2022-04-25 09:52:39 +02:00
parent 94a287afc6
commit c1f5524cec
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
calendar.php
View file

@ -3160,10 +3160,16 @@ $("#rcmfd_new_category").keypress(function(event) {
*/ */
private function mail_agenda_event_row($event, $class = '') private function mail_agenda_event_row($event, $class = '')
{ {
$time = !empty($event['allday']) ? $this->gettext('all-day') : if (!empty($event['allday'])) {
$this->rc->format_date($event['start'], $this->rc->config->get('time_format')) $time = $this->gettext('all-day');
. ' - ' . }
$this->rc->format_date($event['end'], $this->rc->config->get('time_format')); else {
$start = is_object($event['start']) ? clone $event['start'] : $event['start'];
$end = is_object($event['end']) ? clone $event['end'] : $event['end'];
$time = $this->rc->format_date($start, $this->rc->config->get('time_format'))
. ' - ' . $this->rc->format_date($end, $this->rc->config->get('time_format'));
}
return html::div(rtrim('event-row ' . ($class ?: $event['className'])), return html::div(rtrim('event-row ' . ($class ?: $event['className'])),
html::span('event-date', $time) html::span('event-date', $time)
@ -3228,7 +3234,7 @@ $("#rcmfd_new_category").keypress(function(event) {
// get prepared inline UI for this event object // get prepared inline UI for this event object
if ($ical_objects->method) { if ($ical_objects->method) {
$append = ''; $append = '';
$date_str = $this->rc->format_date($event['start'], $this->rc->config->get('date_format'), empty($event['start']->_dateonly)); $date_str = $this->rc->format_date(clone $event['start'], $this->rc->config->get('date_format'), empty($event['start']->_dateonly));
$date = new DateTime($event['start']->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC')); $date = new DateTime($event['start']->format('Y-m-d') . ' 12:00:00', new DateTimeZone('UTC'));
// prepare a small agenda preview to be filled with actual event data on async request // prepare a small agenda preview to be filled with actual event data on async request