From 6760ad8a0b519416b27f937df45078251934dbc7 Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Tue, 11 Jun 2024 15:49:17 +0200
Subject: [PATCH] * Calendar: fix editing recurring events of type
 RDATE/explicit dates changing time and giving error "duration longer than
 interval", and now also displaying the explicit times

---
 calendar/inc/class.calendar_bo.inc.php    |  2 +-
 calendar/inc/class.calendar_rrule.inc.php |  1 +
 calendar/lang/egw_de.lang                 |  1 +
 calendar/lang/egw_en.lang                 |  1 +
 calendar/templates/default/edit.xet       | 14 +++++++++++++-
 calendar/templates/mobile/app.css         |  5 +++++
 calendar/templates/pixelegg/app.css       |  5 +++++
 calendar/templates/pixelegg/app.less      |  7 +++++++
 8 files changed, 34 insertions(+), 2 deletions(-)

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 @@
 				</row>
 				<row valign="top">
 					<et2-description  for="recur_data" value="Repeat days"></et2-description>
-					<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
+					<et2-vbox>
+						<et2-select-dow statustext="Days of the week for a weekly repeated event" id="recur_data" rows="6"
                                     multiple="true" placeholder=""></et2-select-dow>
+						<grid id="recur_rdates" class="recur_rdates">
+							<columns>
+								<column/>
+							</columns>
+							<rows>
+								<row>
+									<et2-date-time id="$row" readonly="true"></et2-date-time>
+								</row>
+							</rows>
+						</grid>
+					</et2-vbox>
 					<et2-vbox>
 						<et2-description  value="Exceptions"></et2-description>
 						<et2-button statustext="Create an exception for the given date" label="@exception_label"
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index 1f5adf04fb..939ae895d2 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -2046,6 +2046,11 @@ div.calendar {
   width: 100%;
   line-height: 30px;
 }
+#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
+  display: table;
+  width: 100%;
+  line-height: normal;
+}
 #calendar-edit #calendar-edit_calendar-edit-custom tbody {
   display: table;
   width: 100%;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 5adaff41ef..d533d0b0ff 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -2034,6 +2034,11 @@ div.calendar {
   width: 100%;
   line-height: 30px;
 }
+#calendar-edit #calendar-edit_calendar-edit-recurrence table.recur_rdates tbody {
+  display: table;
+  width: 100%;
+  line-height: normal;
+}
 #calendar-edit #calendar-edit_calendar-edit-custom tbody {
   display: table;
   width: 100%;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 6c10505184..70f08cc7cc 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -489,6 +489,13 @@ div.calendar { position: relative; }
 			line-height: 30px;
         }
     }
+    #calendar-edit_calendar-edit-recurrence{
+        table.recur_rdates tbody {
+            display: table;
+            width: 100%;
+            line-height: normal;
+        }
+    }
 
     /*###########################################*/
     // Benutzerdefiniert