Form-to-icalrecur logic for both types of yearly events.

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index 86142ad8c25bbf5f3a8680e417964fa1cb6f000f..138bc0ff38ffcde2ed92dceed026a4f497f6d2d2 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -938,11 +938,15 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
                                        break;
 
                                case ICAL_YEARLY_RECURRENCE:
-                                       if (!strcasecmp(bstr("rrmonthtype"), "rryeartype_ymday")) {
+                                       if (!strcasecmp(bstr("rryeartype"), "rryeartype_ymday")) {
                                                /* no further action is needed here */
                                        }
-                                       if (!strcasecmp(bstr("rrmonthtype"), "rryeartype_ywday")) {
-                                               /* FIXME implement this */
+                                       else if (!strcasecmp(bstr("rryeartype"), "rryeartype_ywday")) {
+                                               recur.by_month[0] = atoi(bstr("rrymonth"));
+                                               recur.by_month[1] = ICAL_RECURRENCE_ARRAY_MAX;
+                                               recur.by_day[0] = (atoi(bstr("rrymweek")) * 8)
+                                                               + atoi(bstr("rrymweekday")) + 1;
+                                               recur.by_day[1] = ICAL_RECURRENCE_ARRAY_MAX;
                                        }
                                        break;