lower case tags

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 062df0c4dbbe5dbfa831affb074d843cab1943a8..4d05750e617f403ad71e1ac7b42fc56f8bfce0fb 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -79,7 +79,7 @@ void calendar_month_view_display_events(time_t thetime) {
                                        }
 
                                        wprintf("<FONT SIZE=-1>"
-                                               "<A HREF=\"/display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+                                               "<a href=\"/display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
                                                WC->disp_cal[i].cal_msgnum,
                                                bstr("calview"),
                                                bstr("year"),
@@ -149,9 +149,9 @@ void calendar_month_view(int year, int month, int day) {
        wprintf("<TD ALIGN=CENTER>");
 
        localtime_r(&previous_month, &tm);
-       wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       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/prevdate_32x.gif\" BORDER=0></A>\n");
+       wprintf("<IMG ALIGN=MIDDLE src=\"/static/prevdate_32x.gif\" BORDER=0></A>\n");
 
        wprintf("&nbsp;&nbsp;"
                "<FONT SIZE=+1 COLOR=\"#FFFFFF\">"
@@ -160,9 +160,9 @@ void calendar_month_view(int year, int month, int day) {
                "&nbsp;&nbsp;", months[month-1], year);
 
        localtime_r(&next_month, &tm);
-       wprintf("<A HREF=\"readfwd?calview=month&year=%d&month=%d&day=1\">",
+       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/nextdate_32x.gif\" BORDER=0></A>\n");
+       wprintf("<IMG ALIGN=MIDDLE src=\"/static/nextdate_32x.gif\" BORDER=0></A>\n");
 
        wprintf("</TD></TR></TABLE>\n");
 
@@ -192,7 +192,7 @@ void calendar_month_view(int year, int month, int day) {
                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\">"
+               wprintf("<a href=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
                        "%d</A></B><br />",
                        tm.tm_year + 1900,
                        tm.tm_mon + 1,
@@ -247,7 +247,12 @@ void calendar_day_view_display_events(int year, int month,
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
                        event_tt = icaltime_as_timet(t);
-                       if (t.is_date) all_day_event = 1;
+                       if (t.is_date) {
+                               all_day_event = 1;
+                       }
+                       else {
+                               all_day_event = 0;
+                       }
 
                        if (all_day_event) {
                                event_tm = gmtime(&event_tt);
@@ -275,7 +280,7 @@ void calendar_day_view_display_events(int year, int month,
                                        }
 
                                        wprintf("<FONT SIZE=-1>"
-                                               "<A HREF=\"/display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d\">",
+                                               "<a href=\"/display_edit_event?msgnum=%ld&calview=day&year=%d&month=%d&day=%d\">",
                                                WC->disp_cal[i].cal_msgnum,
                                                year, month, day
                                        );
@@ -301,8 +306,16 @@ void calendar_day_view(int year, int month, int day) {
        int hour;
        struct icaltimetype today, yesterday, tomorrow;
        char calhourformat[16];
+       int daystart = 8;
+       int dayend = 17;
+       char daystart_str[16], dayend_str[16];
 
        get_preference("calhourformat", calhourformat, sizeof calhourformat);
+       get_preference("daystart", daystart_str, sizeof daystart_str);
+       if (strlen(daystart_str) > 0) daystart = atoi(daystart_str);
+       get_preference("dayend", dayend_str, sizeof dayend_str);
+       if (strlen(dayend_str) > 0) dayend = atoi(dayend_str);
+       
 
        /* Figure out the dates for "yesterday" and "tomorrow" links */
 
@@ -339,16 +352,16 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<TR>"
                "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
                "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
-       for (hour = (-1); hour <= 7; ++hour) {
+       for (hour = (-1); hour <= (daystart-1); ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
        wprintf("</TD></TR>\n");
 
        /* Now the middle of the day... */      
-       for (hour = 8; hour <= 17; ++hour) {    /* could do HEIGHT=xx */
+       for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */
                wprintf("<TR HEIGHT=30><TD BGCOLOR=\"#CCCCDD\" ALIGN=MIDDLE "
                        "VALIGN=MIDDLE WIDTH=10%%>");
-               wprintf("<A HREF=\"/display_edit_event?msgnum=0"
+               wprintf("<a href=\"/display_edit_event?msgnum=0"
                        "&year=%d&month=%d&day=%d&hour=%d&minute=0\">",
                        year, month, day, hour
                );
@@ -375,7 +388,7 @@ void calendar_day_view(int year, int month, int day) {
        wprintf("<TR>"
                "<TD BGCOLOR=\"#CCCCDD\" VALIGN=MIDDLE WIDTH=10%%></TD>"
                "<TD BGCOLOR=\"#FFFFFF\" VALIGN=TOP>");
-       for (hour = 18; hour <= 23; ++hour) {
+       for (hour = (dayend+1); hour <= 23; ++hour) {
                calendar_day_view_display_events(year, month, day, hour);
        }
        wprintf("</TD></TR>\n");
@@ -395,9 +408,9 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Left arrow */        
        wprintf("<TD ALIGN=CENTER>");
-       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+       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("<IMG ALIGN=MIDDLE src=\"/static/prevdate_32x.gif\" BORDER=0></A>");
        wprintf("</TD>");
 
        /* Today's date */
@@ -410,9 +423,9 @@ void calendar_day_view(int year, int month, int day) {
 
        /* Right arrow */
        wprintf("<TD ALIGN=CENTER>");
-       wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">",
+       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\""
+       wprintf("<IMG ALIGN=MIDDLE src=\"/static/nextdate_32x.gif\""
                " BORDER=0></A>\n");
        wprintf("</TD>");
 
@@ -462,7 +475,12 @@ void calendar_summary_view(void) {
                if (p != NULL) {
                        t = icalproperty_get_dtstart(p);
                        event_tt = icaltime_as_timet(t);
-                       if (t.is_date) all_day_event = 1;
+                       if (t.is_date) {
+                               all_day_event = 1;
+                       }
+                       else {
+                               all_day_event = 0;
+                       }
                        fmt_time(timestring, event_tt);
 
                        if (all_day_event) {
@@ -635,12 +653,12 @@ void do_tasks_view(void) {
 
                p = icalcomponent_get_first_property(WC->disp_cal[i].cal,
                                                        ICAL_SUMMARY_PROPERTY);
-               wprintf("<A HREF=\"/display_edit_task?msgnum=%ld&taskrm=",
+               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;");
+                       "src=\"/static/taskmanag_16x.gif\" BORDER=0>&nbsp;");
                if (p != NULL) {
                        escputs((char *)icalproperty_get_comment(p));
                }