diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 3d640e27f6..513b6bffed 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1028,7 +1028,7 @@ class calendar_bo // same with the recur exceptions and rdates foreach(['recur_exception', 'recur_rdates'] as $name) { - if (is_array($event[$name] ?? null)) continue; + if (!is_array($event[$name] ?? null)) continue; foreach($event[$name] as &$date) { if ($event['whole_day'] && $date_format != 'server') diff --git a/calendar/inc/class.calendar_rrule.inc.php b/calendar/inc/class.calendar_rrule.inc.php index ba3662be65..cce2ec41ff 100644 --- a/calendar/inc/class.calendar_rrule.inc.php +++ b/calendar/inc/class.calendar_rrule.inc.php @@ -375,6 +375,7 @@ class calendar_rrule implements Iterator { switch($type) { + default: case self::DAILY: $duration = 24*3600; break; diff --git a/calendar/lang/egw_de.lang b/calendar/lang/egw_de.lang index cfcd5f216f..80c23634c7 100644 --- a/calendar/lang/egw_de.lang +++ b/calendar/lang/egw_de.lang @@ -247,6 +247,7 @@ exclude weekend calendar de Wochenende ausschließen execute a further action for this entry calendar de Führt einen weiteren Befehl für diesen Eintrag aus existing links calendar de Bestehende Verknüpfungen exists calendar de Existiert +explicit dates calendar de Explizite Termine export definition to use for nextmatch export calendar de Export Profil der Listenansicht (Disketten Symbol) exports events from your calendar in ical format. calendar de Exportiert Termine im iCal-Format exports events from your calendar into a csv file. calendar de Exportiert Termine im CSV-Format diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index d936204272..30265ce430 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -247,6 +247,7 @@ exclude weekend calendar en Exclude Weekend execute a further action for this entry calendar en Execute a further action for this entry existing links calendar en Existing links exists calendar en Exists +explicit dates calendar en Explicit dates export definition to use for nextmatch export calendar en Export definition to use for nextmatch export exports events from your calendar in ical format. calendar en Exports events from your calendar in iCal format. exports events from your calendar into a csv file. calendar en Exports events from your calendar into a CSV file. diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet index d8528dfc9e..7e99d8ddbf 100644 --- a/calendar/templates/default/edit.xet +++ b/calendar/templates/default/edit.xet @@ -120,8 +120,20 @@ - + + + + + + + + + + + +