* Reduce some of the calendar editor elements to prevent them from overflowing the...

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index 138bc0ff38ffcde2ed92dceed026a4f497f6d2d2..2ece06d1c535ce44219d31a33a889d327e87300b 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -33,6 +33,13 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        char weekday_labels[7][32];
        char month_labels[12][32];
        long weekstart = 0;
+       icalproperty *rrule = NULL;
+       struct icalrecurrencetype recur;
+
+       char *tabnames[3];
+       tabnames[0] = _("Event");
+       tabnames[1] = _("Attendees");
+       tabnames[2] = _("Recurrence");
 
        get_pref_long("weekstart", &weekstart, 17);
        if (weekstart > 6) weekstart = 0;
@@ -71,6 +78,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
+
+               /* Convert all timestamps to UTC to make them easier to process. */
+               ical_dezonify(vevent);
+
                /*
                 * If we're looking at a fully encapsulated VCALENDAR
                 * rather than a VEVENT component, attempt to use the first
@@ -136,11 +147,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
                bstr("day"));
 
-       char *tabnames[] = {
-               _("Event"),
-               _("Attendees"),
-               _("Recurrence")
-       };
 
        tabbed_dialog(3, tabnames);
        begin_tab(0, 3);
@@ -256,7 +262,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf(_("Notes"));
        wprintf("</B></TD><TD>\n"
                "<TEXTAREA NAME=\"description\" wrap=soft "
-               "ROWS=5 COLS=80 WIDTH=80>\n"
+               "ROWS=5 COLS=72 WIDTH=72>\n"
        );
        p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
@@ -382,7 +388,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("</TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
-               "ROWS=3 COLS=80 WIDTH=80>\n",
+               "ROWS=10 COLS=72 WIDTH=72>\n",
                (organizer_is_me ? "" : "DISABLED ")
        );
        i = 0;
@@ -410,8 +416,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        /* Recurrence tab */
        begin_tab(2, 3);
-       icalproperty *rrule = NULL;
-       struct icalrecurrencetype recur;
 
        rrule = icalcomponent_get_first_property(vevent, ICAL_RRULE_PROPERTY);
        if (rrule) {
@@ -438,15 +442,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
 
-       /* 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"),
@@ -591,9 +586,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        int rrymweek = rrmweek;
        int rrymweekday = rrmweekday;
        int rrymonth = t_start.month;
-
-       lprintf(9, "FIXME: RRYMWEEK %d, RRYMWEEKDAY %d, RRYMONTH %d\n", rrymweek, rrymweekday, rrymonth);
-
        int which_rryeartype_is_preselected = 0;
 
        if ( (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) 
@@ -768,6 +760,10 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
+
+               /* Convert all timestamps to UTC to make them easier to process. */
+               ical_dezonify(vevent);
+
                /*
                 * If we're looking at a fully encapsulated VCALENDAR
                 * rather than a VEVENT component, attempt to use the first
@@ -849,16 +845,10 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
                        icaltime_from_webform(&event_start, "dtstart");
                }
 
-               /*
-                * The following odd-looking snippet of code looks like it
-                * takes some unnecessary steps.  It is done this way because
-                * libical incorrectly turns an "all day event" into a normal
-                * event starting at midnight (i.e. it serializes as date/time
-                * instead of just date) unless icalvalue_new_date() is used.
-                * So we force it, if this is an all day event.
-                */
                prop = icalproperty_new_dtstart(event_start);
+
                if (all_day_event) {
+                       /* Force it to serialize as a date-only rather than date/time */
                        icalproperty_set_value(prop, icalvalue_new_date(event_start));
                }
 
@@ -1028,7 +1018,11 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
 
                /* First, strip out the parenthesized partstats.  */
                strcpy(form_attendees, bstr("attendees"));
-               stripout(form_attendees, '(', ')');
+               do {
+                       i = strlen(form_attendees);
+                       stripout(form_attendees, '(', ')');
+                       j = strlen(form_attendees);
+               } while (i != j);
 
                /* Next, change any commas to newlines, because we want newline-separated attendees. */
                j = strlen(form_attendees);
@@ -1151,8 +1145,13 @@ STARTOVER:       for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                icalcomponent_free(vevent);
        }
 
-       /* If this was a save or delete, go back to the calendar view. */
+       /* If this was a save or delete, go back to the calendar or summary view. */
        if (!havebstr("check_button")) {
-               readloop("readfwd");
+               if (!strcasecmp(bstr("calview"), "summary")) {
+                       summary();
+               }
+               else {
+                       readloop(readfwd);
+               }
        }
 }