gunnar: server/kolab-webclient/kronolith/patches/kronolith-2.3.3 series, 1.8, 1.9 t_SyncML_UV_RecurringEventsWeekCount.diff, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Tue Mar 9 09:21:09 CET 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3
In directory doto:/tmp/cvs-serv16015/kolab-webclient/kronolith/patches/kronolith-2.3.3
Modified Files:
series t_SyncML_UV_RecurringEventsWeekCount.diff
Log Message:
MFB: kolab/issue3894 (kronolith writes recurrent event data non-conformant to vCal (1.0) standard)
All TODOs merged.
Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/series,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- series 8 Mar 2010 17:26:09 -0000 1.8
+++ series 9 Mar 2010 08:21:07 -0000 1.9
@@ -9,4 +9,6 @@
t_kronolith_HK_GW_HandleEmptyDates.diff
t_kronolith_HK_UV_dateInputFieldOrder.diff
t_kronolith_HK_UV_searchTabs.diff
-t_kronolith_HK_GW_AdaptStartDateOfRecurrencesWhenEditing.diff
\ No newline at end of file
+t_kronolith_HK_GW_AdaptStartDateOfRecurrencesWhenEditing.diff
+t_kronolith_HK_UV_SyncMLSyncBackendBeforeSync.diff
+t_SyncML_UV_RecurringEventsWeekCount.diff
\ No newline at end of file
Index: t_SyncML_UV_RecurringEventsWeekCount.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/patches/kronolith-2.3.3/t_SyncML_UV_RecurringEventsWeekCount.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_SyncML_UV_RecurringEventsWeekCount.diff 22 Jan 2010 23:23:52 -0000 1.1
+++ t_SyncML_UV_RecurringEventsWeekCount.diff 9 Mar 2010 08:21:07 -0000 1.2
@@ -20,7 +20,7 @@
index 5aa5960..acbbee7 100644
--- a/lib/Recurrence.php
+++ b/lib/Recurrence.php
-@@ -944,6 +944,7 @@ class Horde_Date_Recurrence {
+@@ -945,6 +945,7 @@
*/
function toRRule10($calendar)
{
@@ -28,7 +28,7 @@
switch ($this->recurType) {
case HORDE_DATE_RECUR_NONE:
return '';
-@@ -959,6 +960,7 @@ class Horde_Date_Recurrence {
+@@ -960,6 +961,7 @@
for ($i = 0; $i <= 7 ; ++$i) {
if ($this->recurOnDay(pow(2, $i))) {
$rrule .= ' ' . $vcaldays[$i];
@@ -36,25 +36,17 @@
}
}
break;
-@@ -997,9 +999,18 @@ class Horde_Date_Recurrence {
- return '';
+@@ -995,7 +997,12 @@
+ return $rrule . ' ' . $calendar->_exportDateTime($recurEnd);
}
-- return $this->hasRecurEnd() ?
-- $rrule . ' ' . $calendar->_exportDate($this->recurEnd) :
-- $rrule . ' #' . (int)$this->getRecurCount();
-+ if ( $this->hasRecurEnd() ) {
-+ $rrule .= ' ' . $calendar->_exportDateTime($this->recurEnd);
+- return $rrule . ' #' . (int)$this->getRecurCount();
++ if ($rec_days_per_week > 1) {
++ $rec_weeks= (int)floor((int)$this->getRecurCount() / $rec_days_per_week);
++ return $rrule . ' #' . $rec_weeks;
+ } else {
-+ if ($rec_days_per_week > 1) {
-+ $rec_weeks= (int)floor((int)$this->getRecurCount() / $rec_days_per_week);
-+ $rrule .= ' #' . $rec_weeks;
-+ } else {
-+ $rrule .= ' #' . (int)$this->getRecurCount();
-+ }
++ return $rrule . ' #' . (int)$this->getRecurCount();
+ }
-+
-+ return $rrule;
}
/**
More information about the commits
mailing list