]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
* Calendar objects UID now generated by generate_uuid() which creates
[citadel.git] / webcit / event.c
index 019bd0c85068d27164c4c7e64d1f2b907e39cf0a..b9ea1fea389e4a7f37e63bbd15cc6489dbbaad79 100644 (file)
@@ -46,8 +46,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        icalproperty *attendee = NULL;
        char attendee_string[SIZ];
        char buf[SIZ];
-       int i;
        int organizer_is_me = 0;
+       int i;
        int sequence = 0;
 
        now = time(NULL) % 60;          /* mod 60 to force :00 seconds */
@@ -57,8 +57,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
                /* If we're looking at a fully encapsulated VCALENDAR
-                * rather than a VTODO component, attempt to use the first
-                * relevant VTODO subcomponent.  If there is none, the
+                * rather than a VEVENT component, attempt to use the first
+                * relevant VEVENT subcomponent.  If there is none, the
                 * NULL returned by icalcomponent_get_first_component() will
                 * tell the next iteration of this function to create a
                 * new one.
@@ -145,7 +145,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                }
        }
        else {
-               memcpy(&tm_now, localtime(&now), sizeof(struct tm));
+               localtime_r(&now, &tm_now);
                tm_now.tm_year = atoi(bstr("year")) - 1900;
                tm_now.tm_mon = atoi(bstr("month")) - 1;
                tm_now.tm_mday = atoi(bstr("day"));
@@ -163,7 +163,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                t_start = icaltime_from_timet_with_zone(
                        mktime(&tm_now),
                        ((!strcasecmp(bstr("alldayevent"), "yes")) ? 1 : 0),
-                       icaltimezone_get_utc_timezone
+                       icaltimezone_get_utc_timezone()
                );
                t_start.is_utc = 1;
 
@@ -171,33 +171,33 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        display_icaltimetype_as_webform(&t_start, "dtstart");
 
        wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
-               "VALUE=\"yes\" onClick=\"
-
-                       if (this.checked) {
-                               this.form.dtstart_hour.value='0';
-                               this.form.dtstart_hour.disabled = true;
-                               this.form.dtstart_minute.value='0';
-                               this.form.dtstart_minute.disabled = true;
-                               this.form.dtend_hour.value='0';
-                               this.form.dtend_hour.disabled = true;
-                               this.form.dtend_minute.value='0';
-                               this.form.dtend_minute.disabled = true;
-                               this.form.dtend_month.disabled = true;
-                               this.form.dtend_day.disabled = true;
-                               this.form.dtend_year.disabled = true;
-                       }
-                       else {
-                               this.form.dtstart_hour.disabled = false;
-                               this.form.dtstart_minute.disabled = false;
-                               this.form.dtend_hour.disabled = false;
-                               this.form.dtend_minute.disabled = false;
-                               this.form.dtend_month.disabled = false;
-                               this.form.dtend_day.disabled = false;
-                               this.form.dtend_year.disabled = false;
-                       }
-
-
-               \" %s >All day event",
+               "VALUE=\"yes\" onClick=\""
+""
+"                      if (this.checked) { "
+"                              this.form.dtstart_hour.value='0'; "
+"                              this.form.dtstart_hour.disabled = true; "
+"                              this.form.dtstart_minute.value='0'; "
+"                              this.form.dtstart_minute.disabled = true; "
+"                              this.form.dtend_hour.value='0'; "
+"                              this.form.dtend_hour.disabled = true; "
+"                              this.form.dtend_minute.value='0'; "
+"                              this.form.dtend_minute.disabled = true; "
+"                              this.form.dtend_month.disabled = true; "
+"                              this.form.dtend_day.disabled = true; "
+"                              this.form.dtend_year.disabled = true; "
+"                      } "
+"                      else { "
+"                              this.form.dtstart_hour.disabled = false; "
+"                              this.form.dtstart_minute.disabled = false; "
+"                              this.form.dtend_hour.disabled = false; "
+"                              this.form.dtend_minute.disabled = false; "
+"                              this.form.dtend_month.disabled = false; "
+"                              this.form.dtend_day.disabled = false; "
+"                              this.form.dtend_year.disabled = false; "
+"                      } "
+" "
+" "
+"              \" %s >All day event",
                (t_start.is_date ? "CHECKED" : "" )
        );
 
@@ -357,39 +357,42 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
                "&nbsp;&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" "
+                               "VALUE=\"Check attendee availability\">\n"
+               "&nbsp;&nbsp;"
                "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n"
                "</CENTER>\n"
        );
 
        wprintf("</FORM>\n");
        
-       wprintf("<SCRIPT language=\"javascript\">
-               <!--
-                       if (document.EventForm.alldayevent.checked) {
-                               document.EventForm.dtstart_hour.value='0';
-                               document.EventForm.dtstart_hour.disabled = true;
-                               document.EventForm.dtstart_minute.value='0';
-                               document.EventForm.dtstart_minute.disabled = true;
-                               document.EventForm.dtend_hour.value='0';
-                               document.EventForm.dtend_hour.disabled = true;
-                               document.EventForm.dtend_minute.value='0';
-                               document.EventForm.dtend_minute.disabled = true;
-                               document.EventForm.dtend_month.disabled = true;
-                               document.EventForm.dtend_day.disabled = true;
-                               document.EventForm.dtend_year.disabled = true;
-                       }
-                       else {
-                               document.EventForm.dtstart_hour.disabled = false;
-                               document.EventForm.dtstart_minute.disabled = false;
-                               document.EventForm.dtend_hour.disabled = false;
-                               document.EventForm.dtend_minute.disabled = false;
-                               document.EventForm.dtend_month.disabled = false;
-                               document.EventForm.dtend_day.disabled = false;
-                               document.EventForm.dtend_year.disabled = false;
-                       }
-               //-->
-               </SCRIPT>
-       ");
+       wprintf("<SCRIPT language=\"javascript\">"
+               "<!--"
+                       "if (document.EventForm.alldayevent.checked) {"
+                               "document.EventForm.dtstart_hour.value='0';"
+                               "document.EventForm.dtstart_hour.disabled = true;"
+                               "document.EventForm.dtstart_minute.value='0';"
+                               "document.EventForm.dtstart_minute.disabled = true;"
+                               "document.EventForm.dtend_hour.value='0';"
+                               "document.EventForm.dtend_hour.disabled = true;"
+                               "document.EventForm.dtend_minute.value='0';"
+                               "document.EventForm.dtend_minute.disabled = true;"
+                               "document.EventForm.dtend_month.disabled = true;"
+                               "document.EventForm.dtend_day.disabled = true;"
+                               "document.EventForm.dtend_year.disabled = true;"
+                       "}"
+                       "else {"
+                               "document.EventForm.dtstart_hour.disabled = false;"
+                               "document.EventForm.dtstart_minute.disabled = false;"
+                               "document.EventForm.dtend_hour.disabled = false;"
+                               "document.EventForm.dtend_minute.disabled = false;"
+                               "document.EventForm.dtend_month.disabled = false;"
+                               "document.EventForm.dtend_day.disabled = false;"
+                               "document.EventForm.dtend_year.disabled = false;"
+                       "}"
+               "//-->"
+               "</SCRIPT>\n"
+       );
 
        do_template("endbox");
        wDumpContent(1);
@@ -422,8 +425,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
        if (supplied_vevent != NULL) {
                vevent = supplied_vevent;
                /* If we're looking at a fully encapsulated VCALENDAR
-                * rather than a VTODO component, attempt to use the first
-                * relevant VTODO subcomponent.  If there is none, the
+                * rather than a VEVENT component, attempt to use the first
+                * relevant VEVENT subcomponent.  If there is none, the
                 * NULL returned by icalcomponent_get_first_component() will
                 * tell the next iteration of this function to create a
                 * new one.
@@ -431,7 +434,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
                        save_individual_event(
                                icalcomponent_get_first_component(
-                                       vevent, ICAL_VTODO_COMPONENT
+                                       vevent, ICAL_VEVENT_COMPONENT
                                ), msgnum
                        );
                        return;
@@ -442,7 +445,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                created_new_vevent = 1;
        }
 
-       if (!strcasecmp(bstr("sc"), "Save")) {
+       if ( (!strcasecmp(bstr("sc"), "Save"))
+          || (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
 
                /* Replace values in the component with ones from the form */
 
@@ -552,7 +556,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                lprintf(9, "Give this event a UID if it doesn't have one.\n");
                if (icalcomponent_get_first_property(vevent,
                   ICAL_UID_PROPERTY) == NULL) {
-                       generate_new_uid(buf);
+                       generate_uuid(buf);
                        icalcomponent_add_property(vevent,
                                icalproperty_new_uid(buf)
                        );
@@ -648,7 +652,7 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
                }
 
                /*
-                * Serialize it and save it to the message base.  We clone it first,
+                * Encapsulate event into full VCALENDAR component.  Clone it first,
                 * for two reasons: one, it's easier to just free the whole thing
                 * when we're done instead of unbundling, but more importantly, we
                 * can't encapsulate something that may already be encapsulated
@@ -656,8 +660,10 @@ STARTOVER: lprintf(9, "Remove unlisted attendees\n");
                 */
                lprintf(9, "Encapsulating into full VCALENDAR component\n");
                encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
+
+               /* If the user clicked 'Save' then save it to the server. */
                lprintf(9, "Serializing it for saving\n");
-               if (encaps != NULL) {
+               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Save")) ) {
                        serv_puts("ENT0 1|||4");
                        serv_gets(buf);
                        if (buf[0] == '4') {
@@ -668,6 +674,19 @@ STARTOVER: lprintf(9, "Remove unlisted attendees\n");
                        }
                        icalcomponent_free(encaps);
                }
+
+               /* Or, check attendee availability if the user asked for that. */
+               if ( (encaps != NULL) && (!strcasecmp(bstr("sc"), "Check attendee availability")) ) {
+
+                       /* Call this function, which does the real work */
+                       check_attendee_availability(encaps);
+
+                       /* This displays the form again, with our annotations */
+                       display_edit_individual_event(encaps, msgnum);
+
+                       icalcomponent_free(encaps);
+               }
+
        }
 
        /*
@@ -683,8 +702,10 @@ STARTOVER: lprintf(9, "Remove unlisted attendees\n");
                icalcomponent_free(vevent);
        }
 
-       /* Go back to the event list */
-       readloop("readfwd");
+       /* If this was a save or deelete, go back to the calendar view. */
+       if (strcasecmp(bstr("sc"), "Check attendee availability")) {
+               readloop("readfwd");
+       }
 }