* Repaired all my b0rken COLOR tags

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index db55d9d4758b9430a6b1fbb31d53f79363b1f5e6..94dc465f93b70c4d5f6cc7253710a09adfd96ad4 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -26,17 +26,16 @@
 #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");
 }
 
-#else  /* HAVE_ICAL_H */
+#else  /* WEBCIT_WITH_CALENDAR_SERVICE */
 
 /****************************************************************************/
 
-#include "ical.h"
 
 void calendar_month_view_display_events(time_t thetime) {
        int i;
@@ -79,7 +78,7 @@ void calendar_month_view_display_events(time_t thetime) {
 
                                        if (all_day_event) {
                                                wprintf("<TABLE border=0 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#CCCCDD>"
+                                                       "<TD BGCOLOR=\"#CCCCDD\">"
                                                );
                                        }
 
@@ -165,7 +164,7 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
-               "<FONT COLOR=#FFFFFF>"
+               "<FONT COLOR=\"#FFFFFF\">"
                "%s %d"
                "</FONT>"
                "&nbsp;&nbsp;", months[month-1], year);
@@ -183,7 +182,7 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<TABLE width=100%% border=0 cellpadding=1 cellspacing=1 "
                "bgcolor=#4444FF>");
        for (i=0; i<7; ++i) {
-               wprintf("<TH><FONT COLOR=#FFFFFF>%s</FONT></TH>", days[i]);
+               wprintf("<TH><FONT COLOR=\"#FFFFFF\">%s</FONT></TH>", days[i]);
        }
 
        /* Now do 35 days */
@@ -195,7 +194,7 @@ void calendar_month_view(int year, int month, int day) {
                        wprintf("<TR>");
                }
 
-               wprintf("<TD BGCOLOR=%s WIDTH=14%% HEIGHT=60 VALIGN=TOP><B>",
+               wprintf("<TD BGCOLOR=\"#%s\" WIDTH=14%% HEIGHT=60 VALIGN=TOP><B>",
                        ((tm.tm_mon != month-1) ? "DDDDDD" :
                        ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" :
                        "FFFFFF"))
@@ -274,7 +273,7 @@ void calendar_day_view_display_events(int year, int month,
 
                                        if (all_day_event) {
                                                wprintf("<TABLE border=1 cellpadding=2><TR>"
-                                                       "<TD BGCOLOR=#CCCCCC>"
+                                                       "<TD BGCOLOR=\"#CCCCCC\">"
                                                );
                                        }
 
@@ -338,8 +337,8 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Display events before 8:00 (hour=-1 is all-day events) */
        wprintf("<TR>"
-               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               "<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);
        }
@@ -347,7 +346,7 @@ 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 HEIGHT=30><TD BGCOLOR=CCCCDD ALIGN=MIDDLE "
+               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\">",
@@ -357,7 +356,7 @@ void calendar_day_view(int year, int month, int day) {
                        (hour <= 12 ? hour : hour-12),
                        (hour < 12 ? "am" : "pm")
                );
-               wprintf("</TD><TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               wprintf("</TD><TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
 
                /* put the data here, stupid */
                calendar_day_view_display_events(year, month, day, hour);
@@ -367,8 +366,8 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Display events after 5:00... */
        wprintf("<TR>"
-               "<TD BGCOLOR=CCCCDD VALIGN=MIDDLE WIDTH=10%%></TD>"
-               "<TD BGCOLOR=FFFFFF VALIGN=TOP>");
+               "<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);
        }
@@ -392,7 +391,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<IMG ALIGN=MIDDLE SRC=\"/static/back.gif\" BORDER=0></A>"
                "</TD>\n");
 
-       wprintf("<TD ALIGN=MIDDLE><FONT COLOR=#FFFFFF>"
+       wprintf("<TD ALIGN=MIDDLE><FONT COLOR=\"#FFFFFF\">"
                "<H2>%s</H2><H1>%d</H1><H3>%d</H3>"
                "</FONT></TD>",
                months[month-1], day, year);
@@ -432,11 +431,78 @@ void calendar_day_view(int year, int month, int day) {
 
 }
 
+/*
+ * 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);
+       memcpy(&today_tm, localtime(&now), sizeof(struct tm));
 
+       wprintf("<UL>");
 
-void do_calendar_view(void) {
+       for (i=0; i<(WC->num_cal); ++i) {
+               p = icalcomponent_get_first_property(WC->disp_cal[i],
+                                               ICAL_DTSTART_PROPERTY);
+               if (p != NULL) {
+                       t = icalproperty_get_dtstart(p);
+                       event_tt = icaltime_as_timet(t);
+                       fmt_time(timestring, event_tt);
+                       memcpy(&event_tm, localtime(&event_tt), sizeof(struct 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)
+                          ) {
+
+                               if (t.is_date) all_day_event = 1;
+
+                               p = icalcomponent_get_first_property(
+                                                       WC->disp_cal[i],
+                                                       ICAL_SUMMARY_PROPERTY);
+                               if (p != NULL) {
+                                       wprintf("<LI>");
+                                       escputs((char *)
+                                               icalproperty_get_comment(p));
+                                       wprintf(" (%s)\n", timestring);
+                               }
+                       }
+               }
+       }
+       wprintf("</UL>\n");
+       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]);
+       }
+       WC->num_cal = 0;
+       free(WC->disp_cal);
+       WC->disp_cal = NULL;
+       free(WC->cal_msgnum);
+       WC->cal_msgnum = NULL;
+}
+
+
+
+
+void do_calendar_view(void) {
        time_t now;
        struct tm tm;
        int year, month, day;
@@ -474,15 +540,8 @@ 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]);
-       }
-       WC->num_cal = 0;
-       free(WC->disp_cal);
-       WC->disp_cal = NULL;
-       free(WC->cal_msgnum);
-       WC->cal_msgnum = NULL;
-}
+       free_calendar_buffer();
 
+}
 
-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */