* calendar_view.c event.c floors.c graphics.c html2html.c iconbar.c: i18n
[citadel.git] / webcit / calendar_view.c
index 28550be8e48cc5ff91c37aa94cc7b9d503fd2ed9..062df0c4dbbe5dbfa831affb074d843cab1943a8 100644 (file)
@@ -1,74 +1,86 @@
 /*
  * $Id$
  *
- *
+ * Handles the HTML display of calendar items.
  */
 
-#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"
 
-#ifndef HAVE_ICAL_H
+#ifndef WEBCIT_WITH_CALENDAR_SERVICE
 
 void do_calendar_view(void) {  /* stub for non-libical builds */
-       wprintf("<CENTER><I>Calendar view not available</I></CENTER><BR>\n");
+       wprintf("<CENTER><I>");
+       wprintf(_("The calendar view is not available."));
+       wprintf("</I></CENTER><br />\n");
+}
+
+void do_tasks_view(void) {     /* stub for non-libical builds */
+       wprintf("<CENTER><I>");
+       wprintf(_("The tasks view is not available."));
+       wprintf("</I></CENTER><br />\n");
 }
 
-#else  /* HAVE_ICAL_H */
+#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
 
 /****************************************************************************/
 
+
 void calendar_month_view_display_events(time_t thetime) {
        int i;
-       struct tm *tm;
+       time_t event_tt;
+       struct tm event_tm;
+       struct tm today_tm;
        icalproperty *p;
        struct icaltimetype t;
        int month, day, year;
+       int all_day_event = 0;
 
        if (WC->num_cal == 0) {
-               wprintf("<BR><BR><BR>\n");
+               wprintf("<br /><br /><br />\n");
                return;
        }
 
-       tm = localtime(&thetime);
-       month = tm->tm_mon + 1;
-       day = tm->tm_mday;
-       year = tm->tm_year + 1900;
+       localtime_r(&thetime, &today_tm);
+       month = today_tm.tm_mon + 1;
+       day = today_tm.tm_mday;
+       year = today_tm.tm_year + 1900;
 
        for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i],
+               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
                                                ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
-                       if ((t.year == year)
-                          && (t.month == month)
-                          && (t.day == day)) {
+                       event_tt = icaltime_as_timet(t);
+
+                       if (t.is_date) all_day_event = 1;
+                       else all_day_event = 0;
+
+                       if (all_day_event) {
+                               gmtime_r(&event_tt, &event_tm);
+                       }
+                       else {
+                               localtime_r(&event_tt, &event_tm);
+                       }
+
+                       if ((event_tm.tm_year == today_tm.tm_year)
+                          && (event_tm.tm_mon == today_tm.tm_mon)
+                          && (event_tm.tm_mday == today_tm.tm_mday)) {
 
                                p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i],
+                                                       WC->disp_cal[i].cal,
                                                        ICAL_SUMMARY_PROPERTY);
                                if (p != NULL) {
+
+                                       if (all_day_event) {
+                                               wprintf("<TABLE border=0 cellpadding=2><TR>"
+                                                       "<TD BGCOLOR=\"#CCCCDD\">"
+                                               );
+                                       }
+
                                        wprintf("<FONT SIZE=-1>"
                                                "<A HREF=\"/display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
-                                               WC->cal_msgnum[i],
+                                               WC->disp_cal[i].cal_msgnum,
                                                bstr("calview"),
                                                bstr("year"),
                                                bstr("month"),
@@ -76,7 +88,12 @@ void calendar_month_view_display_events(time_t thetime) {
                                        );
                                        escputs((char *)
                                                icalproperty_get_comment(p));
-                                       wprintf("</A></FONT><BR>\n");
+                                       wprintf("</A></FONT><br />\n");
+
+                                       if (all_day_event) {
+                                               wprintf("</TD></TR></TABLE>");
+                                       }
+
                                }
 
                        }
@@ -90,7 +107,7 @@ void calendar_month_view_display_events(time_t thetime) {
 
 void calendar_month_view(int year, int month, int day) {
        struct tm starting_tm;
-       struct tm *tm;
+       struct tm tm;
        time_t thetime;
        int i;
        time_t previous_month;
@@ -105,89 +122,90 @@ void calendar_month_view(int year, int month, int day) {
        starting_tm.tm_mday = day;
        thetime = mktime(&starting_tm);
 
-       tm = &starting_tm;
-       while (tm->tm_mday != 1) {
+       memcpy(&tm, &starting_tm, sizeof(struct tm));
+       while (tm.tm_mday != 1) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
-               tm = localtime(&thetime);
+               localtime_r(&thetime, &tm);
        }
 
        /* Determine previous and next months ... for links */
        previous_month = thetime - (time_t)864000L;     /* back 10 days */
        next_month = thetime + (time_t)(31L * 86400L);  /* ahead 31 days */
-       lprintf(9, "previous month is %s", asctime(localtime(&previous_month)));
-       lprintf(9, "next month is %s", asctime(localtime(&next_month)));
 
        /* Now back up until we're on a Sunday */
-       tm = localtime(&thetime);
-       while (tm->tm_wday != 0) {
+       localtime_r(&thetime, &tm);
+       while (tm.tm_wday != 0) {
                thetime = thetime - (time_t)86400;      /* go back 24 hours */
-               tm = localtime(&thetime);
+               localtime_r(&thetime, &tm);
        }
 
        /* Outer table (to get the background color) */
-       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#4444FF><TR><TD>\n");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
+               "bgcolor=#204B78><TR><TD>\n");
 
-       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0>"
-               "<TR><TD align=left><font color=#FFFFFF>"
-               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0\">"
-               "Add new calendar event</A>"
-               "</font></TD>\n");
+       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0><tr>\n");
 
-       wprintf("<TD><CENTER><H3>");
+       wprintf("<TD ALIGN=CENTER>");
 
-       tm = localtime(&previous_month);
+       localtime_r(&previous_month, &tm);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
-               (int)(tm->tm_year)+1900, tm->tm_mon + 1);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/prevdate_32x.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
-               "<FONT COLOR=#FFFFFF>"
+               "<FONT SIZE=+1 COLOR=\"#FFFFFF\">"
                "%s %d"
                "</FONT>"
                "&nbsp;&nbsp;", months[month-1], year);
 
-       tm = localtime(&next_month);
+       localtime_r(&next_month, &tm);
        wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
-               (int)(tm->tm_year)+1900, tm->tm_mon + 1);
-       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/forward.gif\" BORDER=0></A>\n");
+               (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/nextdate_32x.gif\" BORDER=0></A>\n");
 
-       wprintf("</H3></TD><TD align=right><font color=#FFFFFF size=-2>"
-               "Click on any date for day view&nbsp;"
-               "</FONT></TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        /* Inner table (the real one) */
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF>");
+               "bgcolor=#204B78><TR>");
        for (i=0; i<7; ++i) {
-               wprintf("<TH><FONT COLOR=#FFFFFF>%s</FONT></TH>", days[i]);
+               wprintf("<TD ALIGN=CENTER WIDTH=14%%>"
+                       "<FONT COLOR=\"#FFFFFF\">%s</FONT></TH>", days[i]);
        }
+       wprintf("</TR>\n");
 
        /* Now do 35 days */
        for (i = 0; i < 35; ++i) {
-               tm = localtime(&thetime);
-               if (tm->tm_wday == 0) {
+               localtime_r(&thetime, &tm);
+
+               /* Before displaying Sunday, start a new row */
+               if ((i % 7) == 0) {
                        wprintf("<TR>");
                }
 
-               wprintf("<TD BGCOLOR=FFFFFF WIDTH=14%% HEIGHT=60 VALIGN=TOP>"
-                       "<B>");
-               if ((i==0) || (tm->tm_mday == 1)) {
-                       wprintf("%s ", months[tm->tm_mon]);
+               wprintf("<TD BGCOLOR=\"#%s\" WIDTH=14%% HEIGHT=60 align=left VALIGN=TOP><B>",
+                       ((tm.tm_mon != month-1) ? "DDDDDD" :
+                       ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
+                       "FFFFFF"))
+               );
+               if ((i==0) || (tm.tm_mday == 1)) {
+                       wprintf("%s ", months[tm.tm_mon]);
                }
                wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-                       "%d</A></B><BR>",
-                       tm->tm_year + 1900,
-                       tm->tm_mon + 1,
-                       tm->tm_mday,
-                       tm->tm_mday);
+                       "%d</A></B><br />",
+                       tm.tm_year + 1900,
+                       tm.tm_mon + 1,
+                       tm.tm_mday,
+                       tm.tm_mday);
 
                /* put the data here, stupid */
                calendar_month_view_display_events(thetime);
 
                wprintf("</TD>");
 
-               if (tm->tm_wday == 6) {
+               /* After displaying Saturday, end the row */
+               if ((i % 7) == 6) {
                        wprintf("</TR>\n");
                }
 
@@ -196,12 +214,12 @@ void calendar_month_view(int year, int month, int day) {
 
        wprintf("</TABLE>"                      /* end of inner table */
                "</TD></TR></TABLE>"            /* end of outer table */
-               "</CENTER>\n");
+               "</div>\n");
 }
 
 
 void calendar_week_view(int year, int month, int day) {
-       wprintf("<CENTER><I>week view FIXME</I></CENTER><BR>\n");
+       wprintf("<CENTER><I>week view FIXME</I></CENTER><br />\n");
 }
 
 
@@ -214,35 +232,60 @@ void calendar_day_view_display_events(int year, int month,
        int i;
        icalproperty *p;
        struct icaltimetype t;
+       time_t event_tt;
+       struct tm *event_tm;
+       int all_day_event = 0;
 
        if (WC->num_cal == 0) {
-               wprintf("<BR><BR><BR>\n");
+               // FIXME wprintf("<br /><br /><br />\n");
                return;
        }
 
        for (i=0; i<(WC->num_cal); ++i) {
-               p = icalcomponent_get_first_property(WC->disp_cal[i],
+               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
                                                ICAL_DTSTART_PROPERTY);
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
-                       if ((t.year == year)
-                          && (t.month == month)
-                          && (t.day == day)
-                          && ( (t.hour == hour) || ((hour<0)&&(t.is_date)) )
+                       event_tt = icaltime_as_timet(t);
+                       if (t.is_date) all_day_event = 1;
+
+                       if (all_day_event) {
+                               event_tm = gmtime(&event_tt);
+                       }
+                       else {
+                               event_tm = localtime(&event_tt);
+                       }
+
+                       if ((event_tm->tm_year == (year-1900))
+                          && (event_tm->tm_mon == (month-1))
+                          && (event_tm->tm_mday == day)
+                          && ( ((event_tm->tm_hour == hour)&&(!t.is_date)) || ((hour<0)&&(t.is_date)) )
                           ) {
 
+
                                p = icalcomponent_get_first_property(
-                                                       WC->disp_cal[i],
+                                                       WC->disp_cal[i].cal,
                                                        ICAL_SUMMARY_PROPERTY);
                                if (p != NULL) {
+
+                                       if (all_day_event) {
+                                               wprintf("<TABLE border=1 cellpadding=2><TR>"
+                                                       "<TD BGCOLOR=\"#CCCCCC\">"
+                                               );
+                                       }
+
                                        wprintf("<FONT SIZE=-1>"
                                                "<A HREF=\"/display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d\">",
-                                               WC->cal_msgnum[i],
+                                               WC->disp_cal[i].cal_msgnum,
                                                year, month, day
                                        );
                                        escputs((char *)
                                                icalproperty_get_comment(p));
-                                       wprintf("</A></FONT><BR>\n");
+                                       wprintf("</A></FONT><br />\n");
+
+                                       if (all_day_event) {
+                                               wprintf("</TD></TR></TABLE>");
+                                       }
                                }
 
                        }
@@ -256,41 +299,46 @@ void calendar_day_view_display_events(int year, int month,
 
 void calendar_day_view(int year, int month, int day) {
        int hour;
+       struct icaltimetype today, yesterday, tomorrow;
+       char calhourformat[16];
 
-       /* Outer table (to get the background color) */
-       wprintf("<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
-               "bgcolor=#4444FF><TR><TD>\n");
+       get_preference("calhourformat", calhourformat, sizeof calhourformat);
 
-       /* Inner table (the real one) */
-       wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF><TR>\n");
+       /* Figure out the dates for "yesterday" and "tomorrow" links */
 
-       wprintf("<TD WIDTH=50%% VALIGN=top>");  /* begin stuff-on-the-left */
+       memset(&today, 0, sizeof(struct icaltimetype));
+       today.year = year;
+       today.month = month;
+       today.day = day;
+       today.is_date = 1;
 
-       wprintf("<CENTER><H3><FONT COLOR=#FFFFFF>"
-               "%s %d, %d"
-               "</FONT></H3></CENTER>\n",
-               months[month-1], day, year);
+       memcpy(&yesterday, &today, sizeof(struct icaltimetype));
+       --yesterday.day;
+       yesterday = icaltime_normalize(yesterday);
 
-       wprintf("<CENTER><font color=#FFFFFF>"
-               "&nbsp;<A HREF=\"/display_edit_event?msgnum=0\">"
-               "Add new calendar event</A>"
-               "<BR><BR>\n");
+       memcpy(&tomorrow, &today, sizeof(struct icaltimetype));
+       ++tomorrow.day;
+       tomorrow = icaltime_normalize(tomorrow);
 
-       wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">"
-               "Back to month view</A>\n", year, month);
 
-       wprintf("</FONT></CENTER>\n");
+       /* Outer table (to get the background color) */
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<TABLE width=100%% border=0 cellpadding=0 cellspacing=0 "
+               "bgcolor=#204B78><TR><TD>\n");
 
-       wprintf("</TD>");                       /* end stuff-on-the-left */
+       /* Inner table (the real one) */
+       wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
+               "bgcolor=#204B78><TR>\n");
 
        /* Innermost table (contains hours etc.) */
-       wprintf("<TD WIDTH=50%%>"
+       wprintf("<TD WIDTH=80%%>"
                "<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
-               "bgcolor=#4444FF>\n");
+               "bgcolor=#204B78>\n");
 
        /* Display events before 8:00 (hour=-1 is all-day events) */
-       wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+       wprintf("<TR>"
+               "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
+               "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
        for (hour = (-1); hour <= 7; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
@@ -298,8 +346,24 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Now the middle of the day... */      
        for (hour = 8; hour <= 17; ++hour) {    /* could do HEIGHT=xx */
-               wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
-               wprintf("%d:00 ", hour);
+               wprintf("<TR HEIGHT=30><TD BGCOLOR=\"#CCCCDD\" ALIGN=MIDDLE "
+                       "VALIGN=MIDDLE WIDTH=10%%>");
+               wprintf("<A HREF=\"/display_edit_event?msgnum=0"
+                       "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
+                       year, month, day, hour
+               );
+
+               if (!strcasecmp(calhourformat, "24")) {
+                       wprintf("%2d:00</A> ", hour);
+               }
+               else {
+                       wprintf("%d:00%s</A> ",
+                               (hour <= 12 ? hour : hour-12),
+                               (hour < 12 ? "am" : "pm")
+                       );
+               }
+
+               wprintf("</TD><TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
 
                /* put the data here, stupid */
                calendar_day_view_display_events(year, month, day, hour);
@@ -308,7 +372,9 @@ void calendar_day_view(int year, int month, int day) {
        }
 
        /* Display events after 5:00... */
-       wprintf("<TR><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+       wprintf("<TR>"
+               "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
+               "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
        for (hour = 18; hour <= 23; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
@@ -316,30 +382,143 @@ void calendar_day_view(int year, int month, int day) {
 
 
        wprintf("</TABLE>"                      /* end of innermost table */
-               "</TD></TR></TABLE>"            /* end of inner table */
-               "</TD></TR></TABLE>"            /* end of outer table */
+               "</TD>"
+       );
+
+       wprintf("<TD WIDTH=20%% VALIGN=top>");  /* begin stuff-on-the-right */
+
+
+       /* Begin todays-date-with-left-and-right-arrows */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% "
+               "CELLSPACING=0 CELLPADDING=0 BGCOLOR=\"#FFFFFF\">\n");
+       wprintf("<TR>");
+
+       /* Left arrow */        
+       wprintf("<TD ALIGN=CENTER>");
+       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+               yesterday.year, yesterday.month, yesterday.day);
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/prevdate_32x.gif\" BORDER=0></A>");
+       wprintf("</TD>");
+
+       /* Today's date */
+       wprintf("<TD ALIGN=CENTER>");
+       wprintf("<FONT SIZE=+2>%s</FONT><br />"
+               "<FONT SIZE=+3>%d</FONT><br />"
+               "<FONT SIZE=+2>%d</FONT><br />",
+               months[month-1], day, year);
+       wprintf("</TD>");
+
+       /* Right arrow */
+       wprintf("<TD ALIGN=CENTER>");
+       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+               tomorrow.year, tomorrow.month, tomorrow.day);
+       wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/nextdate_32x.gif\""
+               " BORDER=0></A>\n");
+       wprintf("</TD>");
+
+       wprintf("</TR></TABLE>\n");
+       /* End todays-date-with-left-and-right-arrows */
+
+       /* In the future we might want to put a month-o-matic here */
+
+       wprintf("</FONT></CENTER>\n");
+
+       wprintf("</TD>");                       /* end stuff-on-the-right */
+
+
+
+       wprintf("</TR></TABLE>"                 /* end of inner table */
+               "</TD></TR></TABLE></div>"      /* end of outer table */
        );
 
 
 
 }
 
+/*
+ * Display today's events.
+ */
+void calendar_summary_view(void) {
+       int i;
+       icalproperty *p;
+       struct icaltimetype t;
+       time_t event_tt;
+       struct tm event_tm;
+       struct tm today_tm;
+       time_t now;
+       int all_day_event = 0;
+       char timestring[SIZ];
+
+       if (WC->num_cal == 0) {
+               return;
+       }
+
+       now = time(NULL);
+       localtime_r(&now, &today_tm);
+
+       for (i=0; i<(WC->num_cal); ++i) {
+               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
+                                               ICAL_DTSTART_PROPERTY);
+               if (p != NULL) {
+                       t = icalproperty_get_dtstart(p);
+                       event_tt = icaltime_as_timet(t);
+                       if (t.is_date) all_day_event = 1;
+                       fmt_time(timestring, event_tt);
+
+                       if (all_day_event) {
+                               gmtime_r(&event_tt, &event_tm);
+                       }
+                       else {
+                               localtime_r(&event_tt, &event_tm);
+                       }
 
+                       if ( (event_tm.tm_year == today_tm.tm_year)
+                          && (event_tm.tm_mon == today_tm.tm_mon)
+                          && (event_tm.tm_mday == today_tm.tm_mday)
+                          ) {
 
 
-void do_calendar_view(void) {
+                               p = icalcomponent_get_first_property(
+                                                       WC->disp_cal[i].cal,
+                                                       ICAL_SUMMARY_PROPERTY);
+                               if (p != NULL) {
+                                       escputs((char *)
+                                               icalproperty_get_comment(p));
+                                       wprintf(" (%s)<br />\n", timestring);
+                               }
+                       }
+               }
+       }
+       free_calendar_buffer();
+}
+
+
+
+void free_calendar_buffer(void) {
        int i;
+       if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) {
+               icalcomponent_free(WC->disp_cal[i].cal);
+       }
+       WC->num_cal = 0;
+       free(WC->disp_cal);
+       WC->disp_cal = NULL;
+}
+
+
+
+
+void do_calendar_view(void) {
        time_t now;
-       struct tm *tm;
+       struct tm tm;
        int year, month, day;
        char calview[SIZ];
 
        /* In case no date was specified, go with today */
        now = time(NULL);
-       tm = localtime(&now);
-       year = tm->tm_year + 1900;
-       month = tm->tm_mon + 1;
-       day = tm->tm_mday;
+       localtime_r(&now, &tm);
+       year = tm.tm_year + 1900;
+       month = tm.tm_mon + 1;
+       day = tm.tm_mday;
 
        /* Now see if a date was specified */
        if (strlen(bstr("year")) > 0) year = atoi(bstr("year"));
@@ -366,15 +545,122 @@ void do_calendar_view(void) {
        }
 
        /* Free the calendar stuff */
-       if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) {
-               icalcomponent_free(WC->disp_cal[i]);
+       free_calendar_buffer();
+
+}
+
+
+/*
+ * Helper function for do_tasks_view().  Returns the date/time due.
+ */
+time_t get_task_due_date(icalcomponent *vtodo) {
+       icalproperty *p;
+
+       if (vtodo == NULL) {
+               return(0L);
        }
-       WC->num_cal = 0;
-       free(WC->disp_cal);
-       WC->disp_cal = NULL;
-       free(WC->cal_msgnum);
-       WC->cal_msgnum = NULL;
+
+       /* If we're looking at a fully encapsulated VCALENDAR
+        * rather than a VTODO component, recurse into the data
+        * structure until we get a VTODO.
+        */
+       if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
+               return get_task_due_date(
+                       icalcomponent_get_first_component(
+                               vtodo, ICAL_VTODO_COMPONENT
+                       )
+               );
+       }
+
+       p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
+       if (p != NULL) {
+               return(icaltime_as_timet(icalproperty_get_due(p)));
+       }
+       else {
+               return(0L);
+       }
+}
+
+
+/*
+ * Compare the due dates of two tasks (this is for sorting)
+ */
+int task_due_cmp(const void *task1, const void *task2) {
+       time_t t1;
+       time_t t2;
+
+       t1 =  get_task_due_date(((struct disp_cal *)task1)->cal);
+       t2 =  get_task_due_date(((struct disp_cal *)task2)->cal);
+
+       if (t1 < t2) return(-1);
+       if (t1 > t2) return(1);
+       return(0);
 }
 
 
-#endif /* HAVE_ICAL_H */
+
+
+
+void do_tasks_view(void) {
+       int i;
+       time_t due;
+       int bg = 0;
+       char buf[SIZ];
+       icalproperty *p;
+
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 cellspacing=0 width=100%% bgcolor=\"#FFFFFF\">\n<tr>\n"
+               "<TH>");
+       wprintf(_("Name of task"));
+       wprintf("</TH><TH>");
+       wprintf(_("Date due"));
+       wprintf("</TH></TR>\n"
+       );
+
+       /* Sort them if necessary */
+       if (WC->num_cal > 1) {
+               qsort(WC->disp_cal,
+                       WC->num_cal,
+                       sizeof(struct disp_cal),
+                       task_due_cmp
+               );
+       }
+
+       if (WC->num_cal) for (i=0; i<(WC->num_cal); ++i) {
+
+               bg = 1 - bg;
+               wprintf("<TR BGCOLOR=\"#%s\"><TD>",
+                       (bg ? "DDDDDD" : "FFFFFF")
+               );
+
+               p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
+                                                       ICAL_SUMMARY_PROPERTY);
+               wprintf("<A HREF=\"/display_edit_task?msgnum=%ld&taskrm=",
+                       WC->disp_cal[i].cal_msgnum );
+               urlescputs(WC->wc_roomname);
+               wprintf("\">");
+               wprintf("<IMG ALIGN=MIDDLE "
+                       "SRC=\"/static/taskmanag_16x.gif\" BORDER=0>&nbsp;");
+               if (p != NULL) {
+                       escputs((char *)icalproperty_get_comment(p));
+               }
+               wprintf("</A>\n");
+               wprintf("</TD>\n");
+
+               due = get_task_due_date(WC->disp_cal[i].cal);
+               fmt_date(buf, due, 0);
+               wprintf("<TD><FONT");
+               if (due < time(NULL)) {
+                       wprintf(" COLOR=\"#FF0000\"");
+               }
+               wprintf(">%s</FONT></TD></TR>\n", buf);
+       }
+
+       wprintf("</table></div>\n");
+
+       /* Free the list */
+       free_calendar_buffer();
+
+}
+
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */