*** empty log message ***

[citadel.git] / webcit / calendar.c

diff --git a/webcit/calendar.c b/webcit/calendar.c
index f1f23b7aaaef630fc35552761523bf5cbdeaff20..a8ed411cd2ec9e1c2face09abb8a423b096d53cf 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -38,7 +38,7 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
                " but support for calendars is not available on this "
                "particular system.  Please ask your system administrator to "
                "install a new version of the Citadel web service with "
-               "calendaring enabled.</I><BR>\n"
+               "calendaring enabled.</I><br />\n"
        );
 
 }
@@ -48,7 +48,7 @@ void display_calendar(long msgnum) {
                "Cannot display calendar item.  You are seeing this error "
                "because your WebCit service has not been installed with "
                "calendar support.  Please contact your system administrator."
-               "</i><br>\n");
+               "</i><br />\n");
 }
 
 void display_task(long msgnum) {
@@ -56,7 +56,7 @@ void display_task(long msgnum) {
                "Cannot display to-do item.  You are seeing this error "
                "because your WebCit service has not been installed with "
                "calendar support.  Please contact your system administrator."
-               "</i><br>\n");
+               "</i><br />\n");
 }
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -332,7 +332,7 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
        cal = icalcomponent_new_from_string(part_source);
 
        if (cal == NULL) {
-               wprintf("Error parsing calendar object<BR>\n");
+               wprintf("Error parsing calendar object<br />\n");
                return;
        }
 
@@ -352,12 +352,14 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 void respond_to_request(void) {
        char buf[SIZ];
 
-       output_headers(3);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
 
+       wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
-               "</TD></TR></TABLE><BR>\n"
+               "</TD></TR></TABLE>\n"
        );
+       wprintf("</div>\n<div id=\"content\">\n");
 
        serv_printf("ICAL respond|%s|%s|%s|",
                bstr("msgnum"),
@@ -394,7 +396,7 @@ void respond_to_request(void) {
 
        wprintf("<A HREF=\"/dotskip?room=");
        urlescputs(WC->wc_roomname);
-       wprintf("\"><BR>Return to messages</A><BR>\n");
+       wprintf("\"><br />Return to messages</A><br />\n");
 
        wDumpContent(1);
 }
@@ -407,12 +409,14 @@ void respond_to_request(void) {
 void handle_rsvp(void) {
        char buf[SIZ];
 
-       output_headers(3);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
 
+       wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
                "Update your calendar with this RSVP</SPAN>"
-               "</TD></TR></TABLE><BR>\n"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
        );
 
        serv_printf("ICAL handle_rsvp|%s|%s|%s|",
@@ -445,7 +449,7 @@ void handle_rsvp(void) {
 
        wprintf("<A HREF=\"/dotskip?room=");
        urlescputs(WC->wc_roomname);
-       wprintf("\"><BR>Return to messages</A><BR>\n");
+       wprintf("\"><br />Return to messages</A><br />\n");
 
        wDumpContent(1);
 }
@@ -472,12 +476,10 @@ void display_individual_cal(icalcomponent *cal, long msgnum) {
        WC->num_cal += 1;
 
        WC->disp_cal = realloc(WC->disp_cal,
-                       (sizeof(icalcomponent *) * WC->num_cal) );
-       WC->disp_cal[WC->num_cal - 1] = icalcomponent_new_clone(cal);
+                       (sizeof(struct disp_cal) * WC->num_cal) );
+       WC->disp_cal[WC->num_cal - 1].cal = icalcomponent_new_clone(cal);
 
-       WC->cal_msgnum = realloc(WC->cal_msgnum,
-                       (sizeof(long) * WC->num_cal) );
-       WC->cal_msgnum[WC->num_cal - 1] = msgnum;
+       WC->disp_cal[WC->num_cal - 1].cal_msgnum = msgnum;
 }
 
 
@@ -519,10 +521,12 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                created_new_vtodo = 1;
        }
 
-       output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
-               "</TD></TR></TABLE><BR>\n"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
        );
        
        do_template("beginbox_nt");
@@ -602,6 +606,8 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        icalproperty *prop;
        icalcomponent *vtodo;
        int created_new_vtodo = 0;
+       int i;
+       int sequence = 0;
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
@@ -667,6 +673,33 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                                icaltime_from_webform("due")
                        )
                );
+
+               /* Give this task a UID if it doesn't have one. */
+               lprintf(9, "Give this task a UID if it doesn't have one.\n");
+               if (icalcomponent_get_first_property(vtodo,
+                  ICAL_UID_PROPERTY) == NULL) {
+                       generate_uuid(buf);
+                       icalcomponent_add_property(vtodo,
+                               icalproperty_new_uid(buf)
+                       );
+               }
+
+               /* Increment the sequence ID */
+               lprintf(9, "Increment the sequence ID\n");
+               while (prop = icalcomponent_get_first_property(vtodo,
+                     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(vtodo, prop);
+                       icalproperty_free(prop);
+               }
+               ++sequence;
+               lprintf(9, "New sequence is %d.  Adding...\n", sequence);
+               icalcomponent_add_property(vtodo,
+                       icalproperty_new_sequence(sequence)
+               );
+               
        
                /* Serialize it and save it to the message base */
                serv_puts("ENT0 1|||4");
@@ -796,7 +829,7 @@ void display_edit_task(void) {
 
        /* Force change the room if we have to */
        if (strlen(bstr("taskrm")) > 0) {
-               gotoroom(bstr("taskrm"), 0);
+               gotoroom(bstr("taskrm"));
        }
 
        msgnum = atol(bstr("msgnum"));
@@ -886,7 +919,7 @@ void do_freebusy(char *req) {
 
        if (buf[0] != '1') {
                wprintf("HTTP/1.0 404 %s\n", &buf[4]);
-               output_headers(0);
+               output_headers(0, 0, 0, 0, 0, 0, 0);
                wprintf("Content-Type: text/plain\n");
                wprintf("\n");
                wprintf("%s\n", &buf[4]);