]> code.citadel.org Git - citadel.git/blobdiff - webcit/event.c
* applied matts datepicker patches
[citadel.git] / webcit / event.c
index 4aa7f9ef1e7bc1a67f7453bf51809e1e63d0468b..f2575508b12dd72a280c40c8a940bdbf68071449 100644 (file)
@@ -1,23 +1,19 @@
 /*
  * $Id$
+ *
+ * Editing calendar events.
  */
-/**
- * \defgroup EditCal Editing calendar events.
- * \ingroup Calendaring
- */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
+/*
  * \brief Display an event by itself (for editing)
  * \param supplied_vevent the event to edit
  * \param msgnum reference on the citserver
  */
-void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
        icalcomponent *vevent;
        icalproperty *p;
        icalvalue *v;
@@ -34,6 +30,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        int i;
        int sequence = 0;
 
+       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")
+       );
+
        now = time(NULL);
        strcpy(organizer_string, "");
        strcpy(attendee_string, "");
@@ -51,8 +51,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
                if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
                        display_edit_individual_event(
                                icalcomponent_get_first_component(
-                                       vevent, ICAL_VEVENT_COMPONENT
-                               ), msgnum
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread
                        );
                        return;
                }
@@ -70,43 +70,13 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
        /** Begin output */
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE class=\"event_banner\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Add or edit an event"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
-
-       wprintf("<script type=\"text/javascript\">"
-               "function grey_all_day() { "
-                       "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"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
 
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table  class=\"event_background\"><tr><td>\n");
@@ -175,25 +145,25 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        else {
                localtime_r(&now, &tm_now);
-               if (!IsEmptyStr(bstr("year"))) {
-                       tm_now.tm_year = atoi(bstr("year")) - 1900;
-                       tm_now.tm_mon = atoi(bstr("month")) - 1;
-                       tm_now.tm_mday = atoi(bstr("day"));
+               if (havebstr("year")) {
+                       tm_now.tm_year = ibstr("year") - 1900;
+                       tm_now.tm_mon = ibstr("month") - 1;
+                       tm_now.tm_mday = ibstr("day");
                }
-               if (!IsEmptyStr(bstr("hour"))) {
-                       tm_now.tm_hour = atoi(bstr("hour"));
-                       tm_now.tm_min = atoi(bstr("minute"));
+               if (havebstr("hour")) {
+                       tm_now.tm_hour = ibstr("hour");
+                       tm_now.tm_min = ibstr("minute");
                        tm_now.tm_sec = 0;
                }
                else {
-                       tm_now.tm_hour = 9;
+                       tm_now.tm_hour = 0;
                        tm_now.tm_min = 0;
                        tm_now.tm_sec = 0;
                }
 
                t_start = icaltime_from_timet_with_zone(
                        mktime(&tm_now),
-                       ((!strcasecmp(bstr("alldayevent"), "yes")) ? 1 : 0),
+                       ((yesbstr("alldayevent")) ? 1 : 0),
                        icaltimezone_get_utc_timezone()
                );
                t_start.is_utc = 1;
@@ -201,10 +171,10 @@ 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=\"grey_all_day();\""
+       wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
+               "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
                " %s >%s",
-               (t_start.is_date ? "CHECKED" : "" ),
+               (t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
                _("All day event")
        );
 
@@ -217,7 +187,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
         */
        wprintf("<TR><TD><B>");
        wprintf(_("End"));
-       wprintf("</B></TD><TD>\n");
+       wprintf("</B></TD><TD id=\"dtendcell\">\n");
        if (t_start.is_date) {
                t_end = t_start;
        }
@@ -408,7 +378,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        
        wprintf("</td></tr></table></div>\n");
        wprintf("<script type=\"text/javascript\">"
-               "grey_all_day();"
+               "eventEditAllDay();"
                "</script>\n"
        );
        
@@ -425,7 +395,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
  * \param supplied_vevent the event to save
  * \param msgnum the index on the citserver
  */
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
        char buf[SIZ];
        icalproperty *prop;
        icalcomponent *vevent, *encaps;
@@ -454,8 +424,8 @@ 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_VEVENT_COMPONENT
-                               ), msgnum
+                                       vevent, ICAL_VEVENT_COMPONENT), 
+                               msgnum, from, unread
                        );
                        return;
                }
@@ -465,8 +435,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                created_new_vevent = 1;
        }
 
-       if ( (!IsEmptyStr(bstr("save_button")))
-          || (!IsEmptyStr(bstr("check_button"))) ) {
+       if ( (havebstr("save_button"))
+          || (havebstr("check_button")) ) {
 
                /** Replace values in the component with ones from the form */
 
@@ -476,7 +446,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalproperty_free(prop);
                }
 
-               if (!IsEmptyStr(bstr("summary"))) {
+               if (havebstr("summary")) {
        
                        icalcomponent_add_property(vevent,
                                        icalproperty_new_summary(bstr("summary")));
@@ -490,7 +460,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalcomponent_remove_property(vevent, prop);
                        icalproperty_free(prop);
                }
-               if (!IsEmptyStr(bstr("location"))) {
+               if (havebstr("location")) {
                        icalcomponent_add_property(vevent,
                                        icalproperty_new_location(bstr("location")));
                }
@@ -499,7 +469,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalcomponent_remove_property(vevent, prop);
                        icalproperty_free(prop);
                }
-               if (!IsEmptyStr(bstr("description"))) {
+               if (havebstr("description")) {
                        icalcomponent_add_property(vevent,
                                icalproperty_new_description(bstr("description")));
                }
@@ -510,7 +480,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        icalproperty_free(prop);
                }
 
-               if (!strcmp(bstr("alldayevent"), "yes")) {
+               if (yesbstr("alldayevent")) {
                        all_day_event = 1;
                }
                else {
@@ -534,9 +504,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                 */
                prop = icalproperty_new_dtstart(event_start);
                if (all_day_event) {
-                       icalproperty_set_value(prop,
-                               icalvalue_new_date(event_start)
-                       );
+                       icalproperty_set_value(prop, icalvalue_new_date(event_start));
                }
 
                if (prop) icalcomponent_add_property(vevent, prop);
@@ -562,7 +530,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                }
 
                /** See if transparency is indicated */
-               if (!IsEmptyStr(bstr("transp"))) {
+               if (havebstr("transp")) {
                        if (!strcasecmp(bstr("transp"), "opaque")) {
                                formtransp = ICAL_TRANSP_OPAQUE;
                        }
@@ -576,33 +544,25 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                                icalproperty_free(prop);
                        }
 
-                       lprintf(9, "adding new property...\n");
                        icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
-                       lprintf(9, "...added it.\n");
                }
 
                /** Give this event a UID if it doesn't have one. */
-               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_uuid(buf);
-                       icalcomponent_add_property(vevent,
-                               icalproperty_new_uid(buf)
-                       );
+                       icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
                }
 
                /** Increment the sequence ID */
-               lprintf(9, "Increment the sequence ID\n");
                while (prop = icalcomponent_get_first_property(vevent,
                      ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
                        i = icalproperty_get_sequence(prop);
-                       lprintf(9, "Sequence was %d\n", i);
                        if (i > sequence) sequence = i;
                        icalcomponent_remove_property(vevent, prop);
                        icalproperty_free(prop);
                }
                ++sequence;
-               lprintf(9, "New sequence is %d.  Adding...\n", sequence);
                icalcomponent_add_property(vevent,
                        icalproperty_new_sequence(sequence)
                );
@@ -611,7 +571,6 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                 * Set the organizer, only if one does not already exist *and*
                 * the form is supplying one
                 */
-               lprintf(9, "Setting the organizer...\n");
                strcpy(buf, bstr("organizer"));
                if ( (icalcomponent_get_first_property(vevent,
                   ICAL_ORGANIZER_PROPERTY) == NULL) 
@@ -628,7 +587,6 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                /**
                 * Add any new attendees listed in the web form
                 */
-               lprintf(9, "Add any new attendees\n");
 
                /* First, strip out the parenthesized partstats.  */
                strcpy(form_attendees, bstr("attendees"));
@@ -650,7 +608,6 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                        extract_token(buf, form_attendees, i, '\n', sizeof buf);
                        striplt(buf);
                        if (!IsEmptyStr(buf)) {
-                               lprintf(9, "Attendee: <%s>\n", buf);
                                sprintf(attendee_string, "MAILTO:%s", buf);
                                foundit = 0;
 
@@ -672,8 +629,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
                /**
                 * Remove any attendees *not* listed in the web form
                 */
-STARTOVER:     lprintf(9, "Remove unlisted attendees\n");
-               for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+STARTOVER:     for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
                        strcpy(attendee_string, icalproperty_get_attendee(attendee));
                        if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
                                strcpy(attendee_string, &attendee_string[7]);
@@ -699,15 +655,13 @@ STARTOVER:        lprintf(9, "Remove unlisted attendees\n");
                 * can't encapsulate something that may already be encapsulated
                 * somewhere else.
                 */
-               lprintf(9, "Encapsulating into full VCALENDAR component\n");
                encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
 
                /* Set the method to PUBLISH */
                icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
 
                /** If the user clicked 'Save' then save it to the server. */
-               lprintf(9, "Serializing it for saving\n");
-               if ( (encaps != NULL) && (!IsEmptyStr(bstr("save_button"))) ) {
+               if ( (encaps != NULL) && (havebstr("save_button")) ) {
                        serv_puts("ENT0 1|||4|||1|");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '8') {
@@ -718,23 +672,23 @@ STARTOVER:        lprintf(9, "Remove unlisted attendees\n");
                        }
                        if ( (buf[0] == '8') || (buf[0] == '4') ) {
                                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                                       lprintf(9, "ENT0 REPLY: %s\n", buf);
                                }
                        }
                        if (buf[0] == '2') {
                                strcpy(WC->ImportantMessage, &buf[4]);
                        }
+                       icalmemory_free_ring ();
                        icalcomponent_free(encaps);
                }
 
                /** Or, check attendee availability if the user asked for that. */
-               if ( (encaps != NULL) && (!IsEmptyStr(bstr("check_button"))) ) {
+               if ( (encaps != NULL) && (havebstr("check_button")) ) {
 
                        /** 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);
+                       display_edit_individual_event(encaps, msgnum, from, unread);
 
                        icalcomponent_free(encaps);
                }
@@ -744,9 +698,8 @@ STARTOVER:  lprintf(9, "Remove unlisted attendees\n");
        /**
         * If the user clicked 'Delete' then delete it.
         */
-       lprintf(9, "Checking to see if we have to delete an old event\n");
-       if ( (!IsEmptyStr(bstr("delete_button"))) && (msgnum > 0L) ) {
-               serv_printf("DELE %ld", atol(bstr("msgnum")));
+       if ( (havebstr("delete_button")) && (msgnum > 0L) ) {
+               serv_printf("DELE %ld", lbstr("msgnum"));
                serv_getln(buf, sizeof buf);
        }
 
@@ -755,12 +708,9 @@ STARTOVER: lprintf(9, "Remove unlisted attendees\n");
        }
 
        /** If this was a save or delete, go back to the calendar view. */
-       if (IsEmptyStr(bstr("check_button"))) {
+       if (!havebstr("check_button")) {
                readloop("readfwd");
        }
 }
 
 
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/*@}*/