* Made all the title boxes the same background color. The old scheme was

[citadel.git] / webcit / calendar.c

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 087a2a8b3f26a071b72d16e931eda146de4593e4..01dd192b1df89a9708168d955d1270dfe831dd4b 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -70,6 +70,7 @@ void display_task(long msgnum) {
 /*
  * Process a calendar object
  * ...at this point it's already been deserialized by cal_process_attachment()
+ *
  */
 void cal_process_object(icalcomponent *cal,
                        int recursion_level,
@@ -103,8 +104,8 @@ void cal_process_object(icalcomponent *cal,
                                "<IMG ALIGN=CENTER "
                                "SRC=\"/static/vcalendar.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Meeting invitation</B>
-                               </TD></TR>\n"
+                               "<B>Meeting invitation</B>"
+                               "</TD></TR>\n"
                        );
                        break;
                    case ICAL_METHOD_REPLY:
@@ -112,8 +113,8 @@ void cal_process_object(icalcomponent *cal,
                                "<IMG ALIGN=CENTER "
                                "SRC=\"/static/vcalendar.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Attendee's reply to your invitation</B>
-                               </TD></TR>\n"
+                               "<B>Attendee's reply to your invitation</B>"
+                               "</TD></TR>\n"
                        );
                        break;
                    case ICAL_METHOD_PUBLISH:
@@ -121,8 +122,8 @@ void cal_process_object(icalcomponent *cal,
                                "<IMG ALIGN=CENTER "
                                "SRC=\"/static/vcalendar.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Published event</B>
-                               </TD></TR>\n"
+                               "<B>Published event</B>"
+                               "</TD></TR>\n"
                        );
                        break;
                    default:
@@ -353,10 +354,9 @@ void respond_to_request(void) {
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Respond to meeting request</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        serv_printf("ICAL respond|%s|%s|%s|",
@@ -409,10 +409,10 @@ void handle_rsvp(void) {
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Update your calendar with this RSVP</B>"
-               "</FONT></TD></TR></TABLE><BR>\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"
        );
 
        serv_printf("ICAL handle_rsvp|%s|%s|%s|",
@@ -489,18 +489,19 @@ void display_individual_task(icalcomponent *vtodo, long msgnum) {
        icalproperty *p;
 
        p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
-       wprintf("<LI><A HREF=\"/display_edit_task?msgnum=%ld&taskrm=", msgnum);
+       wprintf("<A HREF=\"/display_edit_task?msgnum=%ld&taskrm=", msgnum);
        urlescputs(WC->wc_roomname);
        wprintf("\">");
        if (p != NULL) {
                escputs((char *)icalproperty_get_comment(p));
        }
-       wprintf("</A>\n");
+       wprintf("</A><BR>\n");
 }
 
 
 /*
  * Display a task by itself (for editing)
+ *
  */
 void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        icalcomponent *vtodo;
@@ -513,6 +514,22 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
+
+               /* 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
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
+                       display_edit_individual_task(
+                               icalcomponent_get_first_component(
+                                       vtodo, ICAL_VTODO_COMPONENT
+                               ), msgnum
+                       );
+                       return;
+               }
        }
        else {
                vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
@@ -520,10 +537,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
 
        output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Edit task</B>"
-               "</FONT></TD></TR></TABLE><BR>\n"
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
+               "</TD></TR></TABLE><BR>\n"
        );
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");
@@ -589,6 +605,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
 /*
  * Save an edited task
+ *
  */
 void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        char buf[SIZ];
@@ -599,6 +616,21 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
+               /* 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
+                * NULL returned by icalcomponent_get_first_component() will
+                * tell the next iteration of this function to create a
+                * new one.
+                */
+               if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
+                       save_individual_task(
+                               icalcomponent_get_first_component(
+                                       vtodo, ICAL_VTODO_COMPONENT
+                               ), msgnum
+                       );
+                       return;
+               }
        }
        else {
                vtodo = icalcomponent_new(ICAL_VTODO_COMPONENT);
@@ -691,6 +723,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
  * type, we load the message and hunt for that MIME type.  If found, we load
  * the relevant part, deserialize it into a libical component, filter it for
  * the requested object type, and feed it to the specified handler.
+ *
  */
 void display_using_handler(long msgnum,
                        char *mimetype,
@@ -835,4 +868,47 @@ void save_event(void) {
        }
 }
 
+
+
+
+
+/*
+ * freebusy display (for client software)
+ */
+void do_freebusy(char *req) {
+       char who[SIZ];
+       char buf[SIZ];
+       char *fb;
+
+       extract_token(who, req, 1, ' ');
+       if (!strncasecmp(who, "/freebusy/", 10)) {
+               strcpy(who, &who[10]);
+       }
+       unescape_input(who);
+
+       if ( (!strcasecmp(&who[strlen(who)-4], ".vcf"))
+          || (!strcasecmp(&who[strlen(who)-4], ".vfb")) ) {
+               who[strlen(who)-4] = 0;
+       }
+
+       lprintf(9, "freebusy requested for <%s>\n", who);
+       serv_printf("ICAL freebusy|%s", who);
+       serv_gets(buf);
+
+       if (buf[0] != '1') {
+               wprintf("HTTP/1.0 404 %s\n", &buf[4]);
+               output_headers(0);
+               wprintf("Content-Type: text/plain\n");
+               wprintf("\n");
+               wprintf("%s\n", &buf[4]);
+               return;
+       }
+
+       fb = read_server_text();
+       http_transmit_thing(fb, strlen(fb), "text/calendar", 0);
+       free(fb);
+}
+
+
+
 #endif /* WEBCIT_WITH_CALENDAR_SERVICE */