* Removed all of the absolute URL's.
[citadel.git] / webcit / calendar.c
index 3702758604a990db85ca34d349165a7f25c5fb4b..e1453d4bfe8b6a7e3de26db3b2b0cbac1427de08 100644 (file)
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
  */
 void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 
-       wprintf("<I>This message contains calendaring/scheduling information,"
+       wprintf(_("<I>This message contains calendaring/scheduling information,"
                " 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")
        );
 
 }
 
 void display_calendar(long msgnum) {
-       wprintf("<i>"
+       wprintf(_("<i>"
                "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) {
-       wprintf("<i>"
+       wprintf(_("<i>"
                "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 */
@@ -83,8 +64,9 @@ void cal_process_object(icalcomponent *cal,
        icalproperty *p;
        struct icaltimetype t;
        time_t tt;
-       char buf[SIZ];
-       char conflict_name[SIZ];
+       char buf[256];
+       char conflict_name[256];
+       char conflict_message[256];
        int is_update = 0;
 
        /* Leading HTML for the display of this object */
@@ -100,50 +82,54 @@ void cal_process_object(icalcomponent *cal,
                the_method = icalproperty_get_method(method);
                switch(the_method) {
                    case ICAL_METHOD_REQUEST:
-                       wprintf("<TR><TD COLSPAN=2>\n"
-                               "<IMG ALIGN=CENTER "
-                               "SRC=\"/static/vcalendar.gif\">"
+                       wprintf("<tr><td colspan=\"2\">\n"
+                               "<img align=\"center\" "
+                               "src=\"static/calarea_48x.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Meeting invitation</B>"
-                               "</TD></TR>\n"
-                       );
+                               "<B>");
+                       wprintf(_("Meeting invitation"));
+                       wprintf("</B></TD></TR>\n");
                        break;
                    case ICAL_METHOD_REPLY:
                        wprintf("<TR><TD COLSPAN=2>\n"
                                "<IMG ALIGN=CENTER "
-                               "SRC=\"/static/vcalendar.gif\">"
+                               "src=\"static/calarea_48x.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Attendee's reply to your invitation</B>"
-                               "</TD></TR>\n"
-                       );
+                               "<B>");
+                       wprintf(_("Attendee's reply to your invitation"));
+                       wprintf("</B></TD></TR>\n");
                        break;
                    case ICAL_METHOD_PUBLISH:
                        wprintf("<TR><TD COLSPAN=2>\n"
                                "<IMG ALIGN=CENTER "
-                               "SRC=\"/static/vcalendar.gif\">"
+                               "src=\"static/calarea_48x.gif\">"
                                "&nbsp;&nbsp;"  
-                               "<B>Published event</B>"
-                               "</TD></TR>\n"
-                       );
+                               "<B>");
+                       wprintf(_("Published event"));
+                       wprintf("</B></TD></TR>\n");
                        break;
                    default:
-                       wprintf("<TR><TD COLSPAN=2>"
-                               "I don't know what to do with this.</TD></TR>"
-                               "\n");
+                       wprintf("<TR><TD COLSPAN=2>");
+                       wprintf(_("This is an unknown type of calendar item."));
+                       wprintf("</TD></TR>\n");
                        break;
                }
        }
 
        p = icalcomponent_get_first_property(cal, ICAL_SUMMARY_PROPERTY);
        if (p != NULL) {
-               wprintf("<TR><TD><B>Summary:</B></TD><TD>");
+               wprintf("<TR><TD><B>");
+               wprintf(_("Summary:"));
+               wprintf("</B></TD><TD>");
                escputs((char *)icalproperty_get_comment(p));
                wprintf("</TD></TR>\n");
        }
 
        p = icalcomponent_get_first_property(cal, ICAL_LOCATION_PROPERTY);
        if (p != NULL) {
-               wprintf("<TR><TD><B>Location:</B></TD><TD>");
+               wprintf("<TR><TD><B>");
+               wprintf(_("Location:"));
+               wprintf("</B></TD><TD>");
                escputs((char *)icalproperty_get_comment(p));
                wprintf("</TD></TR>\n");
        }
@@ -160,8 +146,9 @@ void cal_process_object(icalcomponent *cal,
                        t = icalproperty_get_dtstart(p);
 
                        if (t.is_date) {
-                               wprintf("<TR><TD><B>Date:"
-                                       "</B></TD><TD>"
+                               wprintf("<TR><TD><B>");
+                               wprintf(_("Date:"));
+                               wprintf("</B></TD><TD>"
                                        "%s %d, %d</TD></TR>",
                                        months[t.month - 1],
                                        t.day, t.year
@@ -169,11 +156,10 @@ void cal_process_object(icalcomponent *cal,
                        }
                        else {
                                tt = icaltime_as_timet(t);
-                               fmt_date(buf, tt);
-                               wprintf("<TR><TD><B>Starting date/time:"
-                                       "</B></TD><TD>"
-                                       "%s</TD></TR>", buf
-                               );
+                               fmt_date(buf, tt, 0);
+                               wprintf("<TR><TD><B>");
+                               wprintf(_("Starting date/time:"));
+                               wprintf("</B></TD><TD>%s</TD></TR>", buf);
                        }
                }
        
@@ -181,25 +167,29 @@ void cal_process_object(icalcomponent *cal,
                if (p != NULL) {
                        t = icalproperty_get_dtend(p);
                        tt = icaltime_as_timet(t);
-                       fmt_date(buf, tt);
-                       wprintf("<TR><TD><B>Ending date/time:</B></TD><TD>"
-                               "%s</TD></TR>", buf
-                       );
+                       fmt_date(buf, tt, 0);
+                       wprintf("<TR><TD><B>");
+                       wprintf(_("Ending date/time:"));
+                       wprintf("</B></TD><TD>%s</TD></TR>", buf);
                }
 
        }
 
        p = icalcomponent_get_first_property(cal, ICAL_DESCRIPTION_PROPERTY);
        if (p != NULL) {
-               wprintf("<TR><TD><B>Description:</B></TD><TD>");
+               wprintf("<TR><TD><B>");
+               wprintf(_("Description:"));
+               wprintf("</B></TD><TD>");
                escputs((char *)icalproperty_get_comment(p));
                wprintf("</TD></TR>\n");
        }
 
        /* If the component has attendees, iterate through them. */
        for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); (p != NULL); p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) {
-               wprintf("<TR><TD><B>Attendee:</B></TD><TD>");
-               strcpy(buf, icalproperty_get_attendee(p));
+               wprintf("<TR><TD><B>");
+               wprintf(_("Attendee:"));
+               wprintf("</B></TD><TD>");
+               safestrncpy(buf, icalproperty_get_attendee(p), sizeof buf);
                if (!strncasecmp(buf, "MAILTO:", 7)) {
 
                        /* screen name or email address */
@@ -229,54 +219,45 @@ void cal_process_object(icalcomponent *cal,
                /* Check for conflicts */
                lprintf(9, "Checking server calendar for conflicts...\n");
                serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '1') {
-                       while (serv_gets(buf), strcmp(buf, "000")) {
-                               extract(conflict_name, buf, 3);
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               extract_token(conflict_name, buf, 3, '|', sizeof conflict_name);
                                is_update = extract_int(buf, 4);
-                               wprintf("<TR><TD><B><I>%s</I></B></TD>"
-                                       "<TD>"
-                                       "%s "
-                                       "<I>&quot;",
 
-                                       (is_update ?
-                                               "Update:" :
-                                               "CONFLICT:"
-                                       ),
+                               if (is_update) {
+                                       snprintf(conflict_message, sizeof conflict_message,
+                                               _("This is an update of '%s' which is already in your calendar."), conflict_name);
+                               }
+                               else {
+                                       snprintf(conflict_message, sizeof conflict_message,
+                                               _("This event would conflict with '%s' which is already in your calendar."), conflict_name);
+                               }
 
+                               wprintf("<TR><TD><B><I>%s</I></B></TD><td>",
                                        (is_update ?
-                                               "This is an update of" :
-                                               "This event would conflict with"
+                                               _("Update:") :
+                                               _("CONFLICT:")
                                        )
-               
                                );
-                               escputs(conflict_name);
-                               wprintf("&quot;</I> "
-                                       "which is already in your calendar."
-                                       "</TD></TR>\n");
+                               escputs(conflict_message);
+                               wprintf("</TD></TR>\n");
                        }
                }
                lprintf(9, "...done.\n");
 
                /* Display the Accept/Decline buttons */
-               wprintf("<TR><TD COLSPAN=2>"
-                       "<FORM METHOD=\"GET\" "
-                       "ACTION=\"/respond_to_request\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Accept\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Tentative\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Decline\">\n"
-                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
-                               "VALUE=\"%ld\">"
-                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
-                               "VALUE=\"%s\">"
-                       "</FORM>"
-                       "</TD></TR>\n",
-                       msgnum, cal_partnum
+               wprintf("<TR><TD>How would you like to respond to this invitation?</td>"
+                       "<td><FONT SIZE=+1>"
+                       "<a href=\"respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Accept\">%s</a>"
+                       " | "
+                       "<a href=\"respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Tentative\">%s</a>"
+                       " | "
+                       "<a href=\"respond_to_request?msgnum=%ld&cal_partnum=%s&sc=Decline\">%s</a>"
+                       "</FONT></TD></TR>\n",
+                       msgnum, cal_partnum, _("Accept"),
+                       msgnum, cal_partnum, _("Tentative"),
+                       msgnum, cal_partnum, _("Decline")
                );
 
        }
@@ -288,28 +269,22 @@ void cal_process_object(icalcomponent *cal,
                 * In the future, if we want to validate this object before
                 * continuing, we can do it this way:
                serv_printf("ICAL whatever|%ld|%s|", msgnum, cal_partnum);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                }
                 ***********/
 
                /* Display the update buttons */
-               wprintf("<TR><TD COLSPAN=2>"
-                       "Click <i>Update</i> to accept this reply and "
-                       "update your calendar."
-                       "<FORM METHOD=\"GET\" "
-                       "ACTION=\"/handle_rsvp\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Update\">\n"
-                       "&nbsp;&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" "
-                               "VALUE=\"Ignore\">\n"
-                       "<INPUT TYPE=\"hidden\" NAME=\"msgnum\" "
-                               "VALUE=\"%ld\">"
-                       "<INPUT TYPE=\"hidden\" NAME=\"cal_partnum\" "
-                               "VALUE=\"%s\">"
-                       "</FORM>"
+               wprintf("<TR><TD>"
+                       "%s"
+                       "</td><td><font size=+1>"
+                       "<a href=\"handle_rsvp?msgnum=%ld&cal_partnum=%s&sc=Update\">%s</a>"
+                       " | "
+                       "<a href=\"handle_rsvp?msgnum=%ld&cal_partnum=%s&sc=Ignore\">%s</a>"
+                       "</font>"
                        "</TD></TR>\n",
-                       msgnum, cal_partnum
+                       _("Click <i>Update</i> to accept this reply and update your calendar."),
+                       msgnum, cal_partnum, _("Update"),
+                       msgnum, cal_partnum, _("Ignore")
                );
 
        }
@@ -332,7 +307,8 @@ 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(_("There was an error parsing this calendar item."));
+               wprintf("<br />\n");
                return;
        }
 
@@ -352,11 +328,13 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 void respond_to_request(void) {
        char buf[SIZ];
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 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>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Respond to meeting request"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
        );
        wprintf("</div>\n<div id=\"content\">\n");
@@ -366,37 +344,39 @@ void respond_to_request(void) {
                bstr("cal_partnum"),
                bstr("sc")
        );
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
                wprintf("<TABLE BORDER=0><TR><TD>"
-                       "<IMG SRC=\"static/vcalendar.gif\" ALIGN=CENTER>"
+                       "<img src=\"static/calarea_48x.gif\" ALIGN=CENTER>"
                        "</TD><TD>"
                );
                if (!strcasecmp(bstr("sc"), "accept")) {
-                       wprintf("You have accepted this meeting invitation.  "
-                               "It has been entered into your calendar, "
+                       wprintf(_("You have accepted this meeting invitation.  "
+                               "It has been entered into your calendar.")
                        );
                } else if (!strcasecmp(bstr("sc"), "tentative")) {
-                       wprintf("You have tentatively accepted this meeting invitation.  "
-                               "It has been 'pencilled in' to your calendar, "
+                       wprintf(_("You have tentatively accepted this meeting invitation.  "
+                               "It has been 'pencilled in' to your calendar.")
                        );
                } else if (!strcasecmp(bstr("sc"), "decline")) {
-                       wprintf("You have declined this meeting invitation.  "
-                               "It has <b>not</b> been entered into your calendar, "
+                       wprintf(_("You have declined this meeting invitation.  "
+                               "It has <b>not</b> been entered into your calendar.")
                        );
                }
-               wprintf("and a reply has been sent to the meeting organizer."
-                       "</TD></TR></TABLE>\n"
-               );
+               wprintf(" ");
+               wprintf(_("A reply has been sent to the meeting organizer."));
+               wprintf("</TD></TR></TABLE>\n");
        } else {
-               wprintf("<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
+               wprintf("<img src=\"static/error.gif\" ALIGN=CENTER>"
                        "%s\n", &buf[4]);
        }
 
-       wprintf("<A HREF=\"/dotskip?room=");
+       wprintf("<a href=\"dotskip?room=");
        urlescputs(WC->wc_roomname);
-       wprintf("\"><br />Return to messages</A><br />\n");
+       wprintf("\"><br />");
+       wprintf(_("Return to messages"));
+       wprintf("</A><br />\n");
 
        wDumpContent(1);
 }
@@ -409,12 +389,13 @@ void respond_to_request(void) {
 void handle_rsvp(void) {
        char buf[SIZ];
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 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>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Update your calendar with this RSVP"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
@@ -424,32 +405,32 @@ void handle_rsvp(void) {
                bstr("cal_partnum"),
                bstr("sc")
        );
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
                wprintf("<TABLE BORDER=0><TR><TD>"
-                       "<IMG SRC=\"static/vcalendar.gif\" ALIGN=CENTER>"
+                       "<img src=\"static/calarea_48x.gif\" ALIGN=CENTER>"
                        "</TD><TD>"
                );
                if (!strcasecmp(bstr("sc"), "update")) {
-                       wprintf("Your calendar has been updated "
-                               "to reflect this RSVP."
-                       );
+                       wprintf(_("Your calendar has been updated to reflect this RSVP."));
                } else if (!strcasecmp(bstr("sc"), "ignore")) {
-                       wprintf("You have chosen to ignore this RSVP. "
-                               "Your calendar has <b>not</b> been updated."
+                       wprintf(_("You have chosen to ignore this RSVP. "
+                               "Your calendar has <b>not</b> been updated.")
                        );
                }
                wprintf("</TD></TR></TABLE>\n"
                );
        } else {
-               wprintf("<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
+               wprintf("<img src=\"static/error.gif\" ALIGN=CENTER>"
                        "%s\n", &buf[4]);
        }
 
-       wprintf("<A HREF=\"/dotskip?room=");
+       wprintf("<a href=\"dotskip?room=");
        urlescputs(WC->wc_roomname);
-       wprintf("\"><br />Return to messages</A><br />\n");
+       wprintf("\"><br />");
+       wprintf(_("Return to messages"));
+       wprintf("</A><br />\n");
 
        wDumpContent(1);
 }
@@ -521,23 +502,29 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                created_new_vtodo = 1;
        }
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR>"
+               "<TD><img src=\"static/taskmanag_48x.gif\"></TD>"
+               "<td><SPAN CLASS=\"titlebar\">");
+       wprintf(_("Edit task"));
+       wprintf("</SPAN>"
                "</TD></TR></TABLE>\n"
                "</div>\n<div id=\"content\">\n"
        );
 
-       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
        
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_task\">\n");
+       wprintf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
 
        wprintf("<TABLE border=0>\n");
 
-       wprintf("<TR><TD>Summary:</TD><TD>"
+       wprintf("<TR><TD>");
+       wprintf(_("Summary:"));
+       wprintf("</TD><TD>"
                "<INPUT TYPE=\"text\" NAME=\"summary\" "
                "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
        p = icalcomponent_get_first_property(vtodo, ICAL_SUMMARY_PROPERTY);
@@ -546,7 +533,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
        wprintf("\"></TD></TR>\n");
 
-       wprintf("<TR><TD>Start date:</TD><TD>");
+       wprintf("<TR><TD>");
+       wprintf(_("Start date:"));
+       wprintf("</TD><TD>");
        p = icalcomponent_get_first_property(vtodo, ICAL_DTSTART_PROPERTY);
        if (p != NULL) {
                t = icalproperty_get_dtstart(p);
@@ -557,7 +546,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        display_icaltimetype_as_webform(&t, "dtstart");
        wprintf("</TD></TR>\n");
 
-       wprintf("<TR><TD>Due date:</TD><TD>");
+       wprintf("<TR><TD>");
+       wprintf(_("Due date:"));
+       wprintf("</TD><TD>");
        p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
        if (p != NULL) {
                t = icalproperty_get_due(p);
@@ -567,7 +558,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        }
        display_icaltimetype_as_webform(&t, "due");
        wprintf("</TD></TR>\n");
-       wprintf("<TR><TD>Description:</TD><TD>");
+       wprintf("<TR><TD>");
+       wprintf(_("Description:"));
+       wprintf("</TD><TD>");
        wprintf("<TEXTAREA NAME=\"description\" wrap=soft "
                "ROWS=10 COLS=80 WIDTH=80>\n"
        );
@@ -578,17 +571,20 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        wprintf("</TEXTAREA></TD></TR></TABLE>\n");
 
        wprintf("<CENTER>"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">"
+               "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">\n"
+               "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
                "&nbsp;&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n"
-               "</CENTER>\n"
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
+               "</CENTER>\n",
+               _("Save"),
+               _("Delete"),
+               _("Cancel")
        );
 
        wprintf("</FORM>\n");
 
-       wprintf("</td></tr></table></center>\n");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 
        if (created_new_vtodo) {
@@ -608,6 +604,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        int created_new_vtodo = 0;
        int i;
        int sequence = 0;
+       struct icaltimetype t;
 
        if (supplied_vtodo != NULL) {
                vtodo = supplied_vtodo;
@@ -632,7 +629,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                created_new_vtodo = 1;
        }
 
-       if (!strcasecmp(bstr("sc"), "Save")) {
+       if (strlen(bstr("save_button")) > 0) {
 
                /* Replace values in the component with ones from the form */
 
@@ -657,10 +654,9 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
+               icaltime_from_webform(&t, "dtstart");
                icalcomponent_add_property(vtodo,
-                       icalproperty_new_dtstart(
-                               icaltime_from_webform("dtstart")
-                       )
+                       icalproperty_new_dtstart(t)
                );
        
                while (prop = icalcomponent_get_first_property(vtodo,
@@ -668,10 +664,9 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
                        icalcomponent_remove_property(vtodo, prop);
                        icalproperty_free(prop);
                }
+               icaltime_from_webform(&t, "due");
                icalcomponent_add_property(vtodo,
-                       icalproperty_new_due(
-                               icaltime_from_webform("due")
-                       )
+                       icalproperty_new_due(t)
                );
 
                /* Give this task a UID if it doesn't have one. */
@@ -712,7 +707,7 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 
                /* Serialize it and save it to the message base */
                serv_puts("ENT0 1|||4");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '4') {
                        serv_puts("Content-type: text/calendar");
                        serv_puts("");
@@ -731,13 +726,13 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
        /*
         * If the user clicked 'Delete' then explicitly delete the message.
         */
-       if (!strcasecmp(bstr("sc"), "Delete")) {
+       if (strlen(bstr("delete_button")) > 0) {
                delete_existing = 1;
        }
 
        if ( (delete_existing) && (msgnum > 0L) ) {
                serv_printf("DELE %ld", atol(bstr("msgnum")));
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        }
 
        if (created_new_vtodo) {
@@ -774,15 +769,15 @@ void display_using_handler(long msgnum,
 
        sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
        serv_puts(buf);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1') return;
 
-       while (serv_gets(buf), strcmp(buf, "000")) {
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                if (!strncasecmp(buf, "part=", 5)) {
-                       extract(mime_filename, &buf[5], 1);
-                       extract(mime_partnum, &buf[5], 2);
-                       extract(mime_disposition, &buf[5], 3);
-                       extract(mime_content_type, &buf[5], 4);
+                       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+                       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+                       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+                       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
                        mime_length = extract_int(&buf[5], 5);
 
                        if (!strcasecmp(mime_content_type, "text/calendar")) {
@@ -912,26 +907,27 @@ void do_freebusy(char *req) {
        char buf[SIZ];
        char *fb;
 
-       extract_token(who, req, 1, ' ');
+       extract_token(who, req, 1, ' ', sizeof who);
        if (!strncasecmp(who, "/freebusy/", 10)) {
                strcpy(who, &who[10]);
        }
        unescape_input(who);
 
        if ( (!strcasecmp(&who[strlen(who)-4], ".vcf"))
+          || (!strcasecmp(&who[strlen(who)-4], ".ifb"))
           || (!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);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] != '1') {
-               wprintf("HTTP/1.0 404 %s\n", &buf[4]);
-               output_headers(0, 0, 0, 0, 0, 0, 0);
-               wprintf("Content-Type: text/plain\n");
-               wprintf("\n");
+               wprintf("HTTP/1.1 404 %s\n", &buf[4]);
+               output_headers(0, 0, 0, 0, 0, 0);
+               wprintf("Content-Type: text/plain\r\n");
+               wprintf("\r\n");
                wprintf("%s\n", &buf[4]);
                return;
        }