* Fixed a bug that caused the default recurrence for a new yearly event to be 'day...

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index 0ad61af5f55837c5f3da753224cd60c600a31baf..9b54b6dfc35851b48e25364506234e3d1eed6f18 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -133,7 +133,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf("SEQUENCE == %d<br />\n", sequence);
        *************************************************************/
 
-       wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
+       wprintf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
@@ -388,6 +388,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 
        wprintf("</TD><TD>"
                "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
+               "onchange=\"EnableOrDisableCheckButton();\" "
+               "onKeyPress=\"EnableOrDisableCheckButton();\" "
                "ROWS=10 COLS=72 WIDTH=72>\n",
                (organizer_is_me ? "" : "DISABLED ")
        );
@@ -588,8 +590,12 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        int rrymonth = t_start.month;
        int which_rryeartype_is_preselected = 0;
 
-       if ( (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) 
-          && (recur.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) ) {
+       if (
+               (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) 
+               && (recur.by_day[0] != 0) 
+               && (recur.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX)
+               && (recur.by_month[0] != 0)
+       ) {
                which_rryeartype_is_preselected = 1;
                rrymweek = icalrecurrencetype_day_position(recur.by_day[0]);
                rrymweekday = icalrecurrencetype_day_day_of_week(recur.by_day[0]) - 1;
@@ -708,8 +714,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"check_button\" "
-                               "VALUE=\"%s\">\n"
+               "<INPUT TYPE=\"submit\" id=\"check_button\" NAME=\"check_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
                "</CENTER>\n",
@@ -724,8 +729,9 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wprintf("</div>\n");                    /* end 'fix_scrollbar_bug' div */
 
        StrBufAppendPrintf(WC->trailing_javascript,
-               "eventEditAllDay();     \n"
-               "RecurrenceShowHide();  \n"
+               "eventEditAllDay();             \n"
+               "RecurrenceShowHide();          \n"
+               "EnableOrDisableCheckButton();  \n"
        );
        address_book_popup();
        wDumpContent(1);
@@ -798,12 +804,11 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr
                }
 
                if (havebstr("summary")) {
-       
                        icalcomponent_add_property(vevent,
                                        icalproperty_new_summary(bstr("summary")));
                } else {
                        icalcomponent_add_property(vevent,
-                                       icalproperty_new_summary("Untitled Event"));
+                                       icalproperty_new_summary(_("Untitled Event")));
                }
        
                while (prop = icalcomponent_get_first_property(vevent,