]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
Calendar date format is now yyyy-mm-dd because that is the
[citadel.git] / webcit / event.c
index d3aac336f855386353cec75c3a569954aaec9841..6034e7087a20301913f0f6fbe12dea9140465d08 100644 (file)
@@ -7,7 +7,6 @@
 #include "webcit.h"
 #include "webserver.h"
 
-
 /*
  * Display an event by itself (for editing)
  * supplied_vevent     the event to edit
@@ -29,11 +28,26 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        int organizer_is_me = 0;
        int i, j = 0;
        int sequence = 0;
+       char weekday_labels[7][32];
 
        lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
                msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
        );
 
+       /* populate the weekday names - begin */
+       now = time(NULL);
+       localtime_r(&now, &tm_now);
+       while (tm_now.tm_wday != 0) {
+               now -= 86400L;
+               localtime_r(&now, &tm_now);
+       }
+       for (i=0; i<7; ++i) {
+               localtime_r(&now, &tm_now);
+               wc_strftime(weekday_labels[i], 32, "%A", &tm_now);
+               now += 86400L;
+       }
+       /* populate the weekday names - end */
+
        now = time(NULL);
        strcpy(organizer_string, "");
        strcpy(attendee_string, "");
@@ -381,64 +395,101 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        struct icalrecurrencetype recur;
 
        rrule = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY);
+       if (rrule) {
+               recur = icalproperty_get_rrule(rrule);
+       }
+       else {
+               /* blank recurrence with some sensible defaults */
+               memset(&recur, 0, sizeof(struct icalrecurrencetype));
+               recur.count = 3;
+               recur.interval = 1;
+               recur.freq = ICAL_WEEKLY_RECURRENCE;
+       }
 
        wprintf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
                "VALUE=\"yes\" "
-               /* "onclick=\"GreyOrUnGrayStuffFIXME();\"" */
+               "onclick=\"RecurrenceShowHide();\""
                " %s >%s",
                (rrule ? "CHECKED=\"CHECKED\"" : "" ),
                _("This is a repeating event")
        );
 
-       if (rrule) {
-               recur = icalproperty_get_rrule(rrule);
+       wprintf("<div id=\"rrule\">\n");                /* begin 'rrule' div */
 
-               wprintf("<table border=0 width=100%%>\n");      /* same table style as the event tab */
+       wprintf("<table border=0 width=100%%>\n");      /* same table style as the event tab */
 
-               /* Table row displaying raw RRULE data, FIXME remove when finished */
+       /* Table row displaying raw RRULE data, FIXME remove when finished */
+       if (rrule) {
                wprintf("<tr><td><b>");
                wprintf("Raw data");
                wprintf("</b></td><td>");
                wprintf("<tt>%s</tt>", icalrecurrencetype_as_string(&recur));
                wprintf("</td></tr>\n");
+       }
 
-               char *frequency_units[] = {
-                       _("seconds"),
-                       _("minutes"),
-                       _("hours"),
-                       _("days"),
-                       _("weeks"),
-                       _("months"),
-                       _("years"),
-                       _("never")
-               };
+       char *frequency_units[] = {
+               _("seconds"),
+               _("minutes"),
+               _("hours"),
+               _("days"),
+               _("weeks"),
+               _("months"),
+               _("years"),
+               _("never")
+       };
 
-               wprintf("<tr><td><b>");
-               wprintf(_("Repeats"));
-               wprintf("</b></td><td>");
-               if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
-               wprintf("every %d %s", recur.interval, frequency_units[recur.freq]);    //FIXME
-               wprintf("</td></tr>\n");
+       wprintf("<tr><td><b>");
+       wprintf(_("Repeats"));
+       wprintf("</b></td><td>");
+       if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
+       wprintf("%s ", _("every"));
+
+       wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
+       wprintf("value=\"%d\"> ", recur.interval);
+
+       wprintf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
+               "onChange=\"RecurrenceShowHide();\">\n");
+       for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
+               wprintf("<option %s%svalue=\"%d\">%s</option>\n",
+                       ((i == recur.freq) ? "selected " : ""),
+                       (((i == recur.freq) || ((i>=3)&&(i<=5))) ? "" : "disabled "),
+                       i,
+                       frequency_units[i]
+               );
+       }
+       wprintf("</select>\n");
 
-               wprintf("<tr><td><b>");
-               wprintf("byday");                                                       //FIXME
-               wprintf("</b></td><td>");
-               for (i=0; i<ICAL_BY_DAY_SIZE; ++i) {
-                       if (recur.by_day[i] == ICAL_RECURRENCE_ARRAY_MAX) {
-                               i = ICAL_RECURRENCE_ARRAY_MAX;                  /* all done */
-                       }
-                       else {
-                               for (j=1; j<=ICAL_SATURDAY_WEEKDAY; ++j) {
-                                       if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j) {
-                                               wprintf("day%d, ", j);
-                                       }
+       wprintf("<div id=\"weekday_selector\">");       /* begin 'weekday_selector' div */
+       wprintf("%s<br>", _("on these weekdays:"));
+
+       char weekday_is_selected[7];
+       memset(weekday_is_selected, 0, 7);
+
+       for (i=0; i<ICAL_BY_DAY_SIZE; ++i) {
+               if (recur.by_day[i] == ICAL_RECURRENCE_ARRAY_MAX) {
+                       i = ICAL_RECURRENCE_ARRAY_MAX;                  /* all done */
+               }
+               else {
+                       for (j=0; j<7; ++j) {
+                               if (icalrecurrencetype_day_day_of_week(recur.by_day[i]) == j+1) {
+                                       weekday_is_selected[j] = 1;
                                }
                        }
                }
-               wprintf("</td></tr>\n");
+       }
 
-               wprintf("</table>\n");
+       for (i=0; i<7; ++i) {
+               wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
+               if (weekday_is_selected[i]) wprintf(" checked");
+               wprintf(">%s</input>\n", weekday_labels[i]);
        }
+       wprintf("</div>\n");                            /* end 'weekday_selector' div */
+
+       wprintf("</td></tr>\n");
+
+       wprintf("</table>\n");
+       wprintf("</div>\n");                            /* end 'rrule' div */
+
        end_tab(2, 3);
 
        /* submit buttons (common area beneath the tabs) */
@@ -463,9 +514,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("</div>\n");
 
-       wprintf("<script type=\"text/javascript\">"
-               "eventEditAllDay();"
-               "</script>\n"
+       wprintf("<script type=\"text/javascript\">      \n"
+               "eventEditAllDay();     \n"
+               "RecurrenceShowHide();  \n"
+               "</script>      \n"
        );
        address_book_popup();
        wDumpContent(1);
@@ -765,6 +817,7 @@ STARTOVER:  for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        }
                        icalmemory_free_ring ();
                        icalcomponent_free(encaps);
+                       encaps = NULL;
                }
 
                /** Or, check attendee availability if the user asked for that. */
@@ -777,6 +830,11 @@ STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                        display_edit_individual_event(encaps, msgnum, from, unread);
 
                        icalcomponent_free(encaps);
+                       encaps = NULL;
+               }
+               if (encaps != NULL) {
+                       icalcomponent_free(encaps);
+                       encaps = NULL;
                }
 
        }