ICAL: validate & fix recurrence and conflict checking.

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index db30c668971f0292cd48bb3ab814c6eda431b095..385e40b66984a928a7a6fc1f6c2e5924b74a53fd 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -417,7 +417,7 @@ HashList *iterate_FindConflict(StrBuf *Target, WCTemplputParams *TP)
                                Done = 1;
                        }
                        else {
-                               Conflict = (CalendarConflict *) malloc(sizeof(CalendarConflict *));
+                               Conflict = (CalendarConflict *) malloc(sizeof(CalendarConflict));
                                Conflict->conflict_event_uid = NewStrBufPlain(NULL, StrLength(Line));
                                Conflict->conflict_event_summary = NewStrBufPlain(NULL, StrLength(Line));
 
@@ -432,6 +432,7 @@ HashList *iterate_FindConflict(StrBuf *Target, WCTemplputParams *TP)
                                Pos = NULL;
                        }
        }
+       FreeStrBuf(&Line);
        syslog(9, "...done.\n");
        return Conflicts;
 }

diff --git a/webcit/static/t/ical/attachment/display.html b/webcit/static/t/ical/attachment/display.html
index 818a11598bd94100a23b684efc1693e97141db4f..55b90c038faf91672b23bea03df136083c55768f 100644 (file)
--- a/webcit/static/t/ical/attachment/display.html
+++ b/webcit/static/t/ical/attachment/display.html
@@ -38,7 +38,7 @@
 <?!("COND:ICAL:PROPERTY", 88, #"ICAL_DESCRIPTION_PROPERTY")><dt><?_("Description:")></dt><dd><?ICAL:PROPERTY:STR("X")></dd><?!("X", 88)>
 
 <?--("Unusual string syntax used here in order to re-use existing translations")>
-<?!("COND:ICAL:PROPERTY", 99, #"ICAL_DESCRIPTION_PROPERTY")><dt><?_("Recurrence")></dt><dd><?_("This is a recurring event")>.</dd><?!("X", 99)>
+<?!("COND:ICAL:PROPERTY", 99, #"ICAL_RRULE_PROPERTY")><dt><?_("Recurrence")></dt><dd><?_("This is a recurring event")>.</dd><?!("X", 99)>
 
 
 <?ITERATE("ICAL:ATTENDEES", ="ical_attachment_display_attendees")>

diff --git a/webcit/static/t/ical/attachment/display_conflict.html b/webcit/static/t/ical/attachment/display_conflict.html
index 47fb42aed8415931f217f8aa1fd1d0f876e7cc3e..b6e285297e7cdbc82be588d867b6eadc323b8185 100644 (file)
--- a/webcit/static/t/ical/attachment/display_conflict.html
+++ b/webcit/static/t/ical/attachment/display_conflict.html
@@ -1,7 +1,7 @@
 <dt>
-<??("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:"  )><??("X", 30)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 30)><?_("Update:"  )><??("X", 30)>
 <??("ICAL:CONFLICT:IS:UPDATE", 40)><?_("CONFLICT:")><??("X", 40)>
 </dt><dd>
-<??("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of"          )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
-<?!("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
+<?!("ICAL:CONFLICT:IS:UPDATE", 10)><?_("This is an update of"          )> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><??("X", 10)>
+<??("ICAL:CONFLICT:IS:UPDATE", 20)><?_("This event would conflict with")> '<?ICAL:CONFLICT:SUMMARY("X")>' <?_("which is already in your calendar.")><?!("X", 20)>
 </dd>