X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=0e8ac9843385bc217f6326014f2110af9c2033cd;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=5960ff5328ecd2f69f40cf796596cd43af5b5dfb;hpb=46b0e48e8a165b23c4477c66f06db474c55fa515;p=citadel.git diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 5960ff532..0e8ac9843 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -1,7 +1,15 @@ /* - * $Id$ - * * Handles the HTML display of calendar items. + * + * Copyright (c) 1996-2012 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "webcit.h" @@ -26,7 +34,7 @@ void embeddable_mini_calendar(int year, int month) long weekstart = 0; char url[256]; char div_id[256]; - + snprintf(div_id, sizeof div_id, "mini_calendar_%d", rand() ); /* Determine what day to start. If an impossible value is found, start on Sunday. @@ -61,15 +69,15 @@ void embeddable_mini_calendar(int year, int month) localtime_r(&thetime, &tm); } - wprintf("
\n", div_id); + wc_printf("
\n", div_id); /* Previous month link */ localtime_r(&previous_month, &tm); - wprintf("«", + wc_printf("«", (int)(tm.tm_year)+1900, tm.tm_mon + 1); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); - wprintf("  " + wc_printf("  " "" "%s %d" "" @@ -77,20 +85,20 @@ void embeddable_mini_calendar(int year, int month) /* Next month link */ localtime_r(&next_month, &tm); - wprintf("»", + wc_printf("»", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("" + wc_printf("
" ""); colheader_time = thetime; for (i=0; i<7; ++i) { colheader_time = thetime + (i * 86400) ; localtime_r(&colheader_time, &colheader_tm); wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm); - wprintf("", colheader_label[0]); + wc_printf("", colheader_label[0]); } - wprintf("\n"); + wc_printf("\n"); /* Now do 35 or 42 days */ @@ -101,21 +109,21 @@ void embeddable_mini_calendar(int year, int month) /* Before displaying Sunday, start a new row */ if ((i % 7) == 0) { - wprintf(""); + wc_printf(""); } if (tm.tm_mon == month-1) { - snprintf(url, sizeof url, "readfwd?calview=day&year=%d&month=%d&day=%d", + snprintf(url, sizeof url, "readfwd?calview=day?year=%d?month=%d?day=%d", tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday); - wprintf("", url, tm.tm_mday); + wc_printf("", url, tm.tm_mday); } else { - wprintf(""); + wc_printf(""); } /* After displaying one week, end the row */ if ((i % 7) == 6) { - wprintf("\n"); + wc_printf("\n"); } } @@ -123,7 +131,7 @@ void embeddable_mini_calendar(int year, int month) thetime += (time_t)86400; /* ahead 24 hours */ } - wprintf("
%c%c
%d%d
" /* end of inner table */ + wc_printf("" /* end of inner table */ "
\n"); StrBufAppendPrintf(WC->trailing_javascript, @@ -174,7 +182,7 @@ void calendar_month_view_display_events(int year, int month, int day) time_t tt; if (GetCount(WCC->disp_cal_items) == 0) { - wprintf("


\n"); + wc_printf("
\n"); return; } @@ -245,6 +253,14 @@ void calendar_month_view_display_events(int year, int month, int day) * If we determined that this event occurs today, then display it. */ if (show_event) { + + /* time_t logtt = icaltime_as_timet(t); + syslog(LOG_DEBUG, "Match on %04d-%02d-%02d for event %x%s on %s", + year, month, day, + (int)Cal, ((all_day_event) ? " (all day)" : ""), + ctime(&logtt) + ); */ + p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY); if (p == NULL) { p = icalproperty_new_summary(_("Untitled Event")); @@ -253,40 +269,45 @@ void calendar_month_view_display_events(int year, int month, int day) if (p != NULL) { if (all_day_event) { - wprintf("" + wc_printf("
" "
" ); } - wprintf("" + + wc_printf("" "" + , (Cal->unread)?"_unread":"_read", Cal->cal_msgnum, year, month, day - ); + ); - wprintf("%s: %s
", _("From"), Cal->from); - wprintf("%s ", _("Summary:")); + escputs((char *) icalproperty_get_comment(p)); + + wc_printf(""); + + wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); escputs((char *)icalproperty_get_comment(p)); - wprintf("
"); - + wc_printf("
"); + q = icalcomponent_get_first_property( Cal->cal, ICAL_LOCATION_PROPERTY); if (q) { - wprintf("%s ", _("Location:")); + wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
"); + wc_printf("
"); } - + /* * Only show start/end times if we're actually looking at the VEVENT * component. Otherwise it shows bogus dates for e.g. timezones */ if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) { - + q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY); if (q != NULL) { int no_end = 0; @@ -320,17 +341,17 @@ void calendar_month_view_display_events(int year, int month, int day) wc_strftime(buf, sizeof buf, "%x", &d_tm); if (no_end || !icaltime_compare(t, end_t)) { - wprintf("%s %s
", + wc_printf("%s %s
", _("Date:"), buf); } else { - wprintf("%s %s
", + wc_printf("%s %s
", _("Starting date:"), buf); d_tm.tm_year = end_t.year - 1900; d_tm.tm_mon = end_t.month - 1; d_tm.tm_mday = end_t.day; wc_strftime(buf, sizeof buf, "%x", &d_tm); - wprintf("%s %s
", + wc_printf("%s %s
", _("Ending date:"), buf); } } @@ -338,43 +359,41 @@ void calendar_month_view_display_events(int year, int month, int day) tt = icaltime_as_timet(t); webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF); if (no_end || !icaltime_compare(t, end_t)) { - wprintf("%s %s
", + wc_printf("%s %s
", _("Date/time:"), buf); } else { - wprintf("%s %s
", + wc_printf("%s %s
", _("Starting date/time:"), buf); tt = icaltime_as_timet(end_t); webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF); - wprintf("%s %s
", _("Ending date/time:"), buf); + wc_printf("%s %s
", _("Ending date/time:"), buf); } - + } } - + } - + q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY); if (q) { - wprintf("%s ", _("Notes:")); + wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
"); + wc_printf("
"); } - - wprintf("\">"); - escputs((char *) - icalproperty_get_comment(p)); - wprintf("
\n"); - + + wc_printf(""); + wc_printf("
\n"); + if (all_day_event) { - wprintf("
"); + wc_printf(""); } - + } - + } - - + + } DeleteHashPos(&Pos); } @@ -399,20 +418,16 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { icalproperty *e; struct icaltimetype t; disp_cal *Cal; - int month, day, year; int all_day_event = 0; char *timeformat; int time_format; - + time_format = get_time_format_cached (); if (time_format == WC_TIMEFORMAT_24) timeformat="%k:%M"; else timeformat="%I:%M %p"; localtime_r(&thetime, &today_tm); - month = today_tm.tm_mon + 1; - day = today_tm.tm_mday; - year = today_tm.tm_year + 1900; Pos = GetNewHashPos(WCC->disp_cal_items, 0); while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) { @@ -435,11 +450,11 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { if ((event_tms.tm_year == today_tm.tm_year) && (event_tms.tm_mon == today_tm.tm_mon) && (event_tms.tm_mday == today_tm.tm_mday)) { - - + + char sbuf[255]; char ebuf[255]; - + p = icalcomponent_get_first_property( Cal->cal, ICAL_SUMMARY_PROPERTY); @@ -459,36 +474,36 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { difftime=(event_tte-event_tts)/60; hours=(int)(difftime / 60); minutes=difftime % 60; - wprintf("%i:%2i" + wc_printf("%i:%2i" "" "", daycolor, hours, minutes, - (Cal->unread)?"_unread":"_read", + (Cal->unread)?"_unread":"_read", daycolor, Cal->cal_msgnum, bstr("year"), bstr("month"), bstr("day") ); - + escputs((char *) icalproperty_get_comment(p)); /* \todo: allso ammitime format */ wc_strftime(&sbuf[0], sizeof(sbuf), timeformat, &event_tms); wc_strftime(&ebuf[0], sizeof(sbuf), timeformat, &event_tme); - - wprintf("" + + wc_printf("" "%s%s", daycolor, sbuf, daycolor, ebuf); } - + } - - + + } } DeleteHashPos(&Pos); @@ -501,15 +516,23 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { void calendar_month_view(int year, int month, int day) { struct tm starting_tm; struct tm tm; + struct tm today_tm; time_t thetime; int i; time_t previous_month; time_t next_month; time_t colheader_time; + time_t today_timet; struct tm colheader_tm; char colheader_label[32]; long weekstart = 0; + /* + * Make sure we know which day is today. + */ + today_timet = time(NULL); + localtime_r(&today_timet, &today_tm); + /* * Determine what day to start. If an impossible value is found, start on Sunday. */ @@ -544,46 +567,45 @@ void calendar_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wprintf("
" - " \n
"); + wc_printf(" \n
"); - wprintf("\n"); + wc_printf("
\n"); - wprintf("
"); + wc_printf(""); localtime_r(&previous_month, &tm); - wprintf("", + wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); - wprintf("  " - "" + wc_printf("  " + "" "%s %d" "" "  ", colheader_label, year); localtime_r(&next_month, &tm); - wprintf("", + wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wc_printf("\"%s\"\n", _("next")); - wprintf("
\n"); + wc_printf("
\n"); /* Inner table (the real one) */ - wprintf(""); - wprintf(""); + wc_printf("
"); + wc_printf(""); colheader_time = thetime; for (i=0; i<7; ++i) { colheader_time = thetime + (i * 86400) ; localtime_r(&colheader_time, &colheader_tm); wc_strftime(colheader_label, sizeof colheader_label, "%A", &colheader_tm); - wprintf("", colheader_label); } - wprintf("\n"); + wc_printf("\n"); /* Now do 35 or 42 days */ @@ -592,22 +614,22 @@ void calendar_month_view(int year, int month, int day) { /* Before displaying the first day of the week, start a new row */ if ((i % 7) == 0) { - wprintf(""); + wc_printf(""); /* After displaying the last day of the week, end the row */ if ((i % 7) == 6) { - wprintf("\n"); + wc_printf("\n"); } thetime += (time_t)86400; /* ahead 24 hours */ @@ -636,23 +658,8 @@ void calendar_month_view(int year, int month, int day) { } } - wprintf("
" + wc_printf("" "%s
"); + wc_printf("
"); wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm); - wprintf("%s ", colheader_label); + wc_printf("%s ", colheader_label); } - wprintf("
", + wc_printf("
", ((tm.tm_mon != month-1) ? "out" : - ((tm.tm_mday == day) ? "today" : + (((tm.tm_year == today_tm.tm_year) && (tm.tm_mon == today_tm.tm_mon) && (tm.tm_mday == today_tm.tm_mday)) ? "today" : ((tm.tm_wday==0 || tm.tm_wday==6) ? "weekend" : "day"))) ); if ((i==0) || (tm.tm_mday == 1)) { wc_strftime(colheader_label, sizeof colheader_label, "%B", &tm); - wprintf("%s ", colheader_label); + wc_printf("%s ", colheader_label); } - wprintf("" + wc_printf("" "%d
", tm.tm_year + 1900, tm.tm_mon + 1, @@ -621,11 +643,11 @@ void calendar_month_view(int year, int month, int day) { tm.tm_mday ); - wprintf("
" /* end of inner table */ - "
" /* end of outer table */ - "
\n"); - - /* - * Initialize the bubble tooltips. - * - * Yes, this is as stupid as it looks. Instead of just making the call - * to btt_enableTooltips() straight away, we have to create a timer event - * and let it initialize as an event after 1 millisecond. This is to - * work around a bug in Internet Explorer that causes it to crash if we - * manipulate the innerHTML of various DOM nodes while the page is still - * being rendered. See http://www.shaftek.org/blog/archives/000212.html - * for more information. - */ - StrBufAppendPrintf(WC->trailing_javascript, - " setTimeout(\"btt_enableTooltips('inner_month')\", 1); \n" + wc_printf("" /* end of inner table */ + "\n" /* end of outer table */ ); } @@ -695,38 +702,37 @@ void calendar_brief_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wprintf("
" - "
\n"); + wc_printf("
\n"); - wprintf("\n"); + wc_printf("
\n"); - wprintf("
"); + wc_printf(""); localtime_r(&previous_month, &tm); - wprintf("", + wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(month_label, sizeof month_label, "%B", &tm); - wprintf("  " - "" + wc_printf("  " + "" "%s %d" "" "  ", month_label, year); localtime_r(&next_month, &tm); - wprintf("", + wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wprintf("\n"); + wc_printf("\"%s\"\n", _("next")); - wprintf("
\n"); + wc_printf("
\n"); /* Inner table (the real one) */ - wprintf(""); - wprintf("\n"); - wprintf("\n"); + wc_printf("
\n"); + wc_printf("
\n"); /* Now do 35 days */ for (i = 0; i < 35; ++i) { @@ -739,9 +745,9 @@ void calendar_brief_month_view(int year, int month, int day) { /* Before displaying Sunday, start a new CELL */ if ((i % 7) == 0) { wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm); - wprintf("" - " \n", - _("Week"), + wc_printf("
%s %s
%s%s%s%s
" + " \n", + _("Week"), weeknumber, _("Hours"), _("Subject"), @@ -749,14 +755,14 @@ void calendar_brief_month_view(int year, int month, int day) { _("End") ); } - + daycolor=((tm.tm_mon != month-1) ? "DDDDDD" : ((tm.tm_wday==0 || tm.tm_wday==6) ? "EEEECC" : "FFFFFF")); - + /* Day Header */ wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm); - wprintf("\n", daycolor, weekday_name,tm.tm_mday, @@ -768,22 +774,22 @@ void calendar_brief_month_view(int year, int month, int day) { /* After displaying Saturday, end the row */ if ((i % 7) == 6) { - wprintf("
%s %s
%s%s%s%s
%s,%i." + wc_printf("
%s,%i." "
\n"); + wc_printf("
\n"); } thetime += (time_t)86400; /* ahead 24 hours */ } - wprintf("
" /* end of inner table */ - "" /* end of outer table */ - "
\n"); + wc_printf("" /* end of inner table */ + "\n" /* end of outer table */ + ); } /* * Calendar week view -- not implemented yet, this is a stub function */ void calendar_week_view(int year, int month, int day) { - wprintf("
week view FIXME

\n"); + wc_printf("
week view FIXME

\n"); } @@ -932,81 +938,85 @@ void calendar_day_view_display_events(time_t thetime, if (all_day_event && notime_events) { - wprintf("
  • " + wc_printf("
  • " "" + , (Cal->unread)?"_unread":"_read", - Cal->cal_msgnum, year, month, day); - wprintf("%s
    ", _("All day event")); - wprintf("%s: %s
    ", _("From"), Cal->from); - wprintf("%s ", _("Summary:")); + Cal->cal_msgnum, year, month, day + ); + escputs((char *) icalproperty_get_comment(p)); + wc_printf(""); + wc_printf("%s
    ", _("All day event")); + wc_printf("%s: %s
    ", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wprintf("
    "); + wc_printf("
    "); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { - wprintf("%s ", _("Location:")); + wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); - wprintf("%s %s
    ", _("Date:"), buf); + wc_printf("%s %s
    ", _("Date:"), buf); } else { webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); - wprintf("%s %s
    ", _("Starting date:"), buf); + wc_printf("%s %s
    ", _("Starting date:"), buf); webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE); - wprintf("%s %s
    ", _("Ending date:"), buf); + wc_printf("%s %s
    ", _("Ending date:"), buf); } q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); if (q) { - wprintf("%s ", _("Notes:")); + wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } - wprintf("\">"); - escputs((char *) icalproperty_get_comment(p)); - wprintf("     ("); - wprintf(_("All day event")); - wprintf(")
    • \n"); + wc_printf(""); + wc_printf(" ("); + wc_printf(_("All day event")); + wc_printf(")\n"); } else if (ongoing_event && notime_events) { - wprintf("
  • " + wc_printf("
  • " "" + , (Cal->unread)?"_unread":"_read", - Cal->cal_msgnum, year, month, day); - wprintf("%s
    ", _("Ongoing event")); - wprintf("%s: %s
    ", _("From"), Cal->from); - wprintf("%s ", _("Summary:")); + Cal->cal_msgnum, year, month, day + ); + escputs((char *) icalproperty_get_comment(p)); + wc_printf(""); + wc_printf("%s
    ", _("Ongoing event")); + wc_printf("%s: %s
    ", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wprintf("
    "); + wc_printf("
    "); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { - wprintf("%s ", _("Location:")); + wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); - wprintf("%s %s
    ", _("Starting date/time:"), buf); + wc_printf("%s %s
    ", _("Starting date/time:"), buf); webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF); - wprintf("%s %s
    ", _("Ending date/time:"), buf); + wc_printf("%s %s
    ", _("Ending date/time:"), buf); q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); if (q) { - wprintf("%s ", _("Notes:")); + wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } - wprintf("\">"); - escputs((char *) icalproperty_get_comment(p)); - wprintf("     ("); - wprintf(_("Ongoing event")); - wprintf(")
    • \n"); + wc_printf(""); + wc_printf(" ("); + wc_printf(_("Ongoing event")); + wc_printf(")\n"); } else if (!all_day_event && !notime_events) { @@ -1049,48 +1059,49 @@ void calendar_day_view_display_events(time_t thetime, /* should never get here */ } - wprintf("
    ", (Cal->unread)?"_unread":"_read", top, (gap * 40), (bottom-top) ); - wprintf("cal_msgnum, year, month, day, t.hour); - wprintf("%s: %s
    ", _("From"), Cal->from); - wprintf("%s ", _("Summary:")); + "class=\"event_title\">" + , + Cal->cal_msgnum, year, month, day, t.hour + ); + escputs((char *) icalproperty_get_comment(p)); + wc_printf(""); + wc_printf("%s: %s
    ", _("From"), Cal->from); + wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wprintf("
    "); + wc_printf("
    "); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { - wprintf("%s ", _("Location:")); + wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); - wprintf("%s %s
    ", _("Date/time:"), buf); + wc_printf("%s %s
    ", _("Date/time:"), buf); } else { webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); - wprintf("%s %s
    ", _("Starting date/time:"), buf); + wc_printf("%s %s
    ", _("Starting date/time:"), buf); webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF); - wprintf("%s %s
    ", _("Ending date/time:"), buf); + wc_printf("%s %s
    ", _("Ending date/time:"), buf); } q = icalcomponent_get_first_property(Cal->cal,ICAL_DESCRIPTION_PROPERTY); if (q) { - wprintf("%s ", _("Notes:")); + wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wprintf("
    "); + wc_printf("
    "); } - wprintf("\">"); - - escputs((char *) icalproperty_get_comment(p)); - wprintf("
    \n"); + wc_printf(""); + wc_printf("\n"); } } } @@ -1106,7 +1117,7 @@ void calendar_day_view(int year, int month, int day) { long daystart; long dayend; struct tm d_tm; - char d_str[128]; + char d_str[160]; int time_format; time_t today_t; int timeline = TIMELINE; @@ -1124,7 +1135,7 @@ void calendar_day_view(int year, int month, int day) { daystart = 9; dayend = 17; } - + /* Today's date */ memset(&d_tm, 0, sizeof d_tm); d_tm.tm_year = year - 1900; @@ -1148,14 +1159,12 @@ void calendar_day_view(int year, int month, int day) { ++tomorrow.day; tomorrow = icaltime_normalize(tomorrow); - wprintf("
    "); - /* Inner table (the real one) */ - wprintf(" \n"); + wc_printf("
    \n"); /* Innermost cell (contains hours etc.) */ - wprintf(""); /* end of innermost table */ + wc_printf(""); + wc_printf(""); /* end of innermost table */ /* Display extra events (start/end times not present or not today) in the middle column */ - wprintf(""); /* end extra on the middle */ + wc_printf(""); /* end extra on the middle */ - wprintf("
    "); - wprintf("
    "); + wc_printf("
    		"); + wc_printf("
    "); /* Now the middle of the day... */ @@ -1164,163 +1173,144 @@ void calendar_day_view(int year, int month, int day) { if (hourlabel > (timeline - 2)) hourlabel = timeline - 2; for (hour = 0; hour < daystart; ++hour) { /* could do HEIGHT=xx */ - wprintf("
    " + wc_printf("
    " "", +/* TODO: what have these been used for? (hour * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); if (time_format == WC_TIMEFORMAT_24) { - wprintf("%2d:00 ", hour); + wc_printf("%2d:00 ", hour); } else { - wprintf("%d:00%s ", + wc_printf("%d:00%s ", ((hour == 0) ? 12 : (hour <= 12 ? hour : hour-12)), (hour < 12 ? "am" : "pm") ); } - wprintf("
    "); + wc_printf(""); } gap = daystart * extratimeline; for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */ - wprintf("
    " + wc_printf("
    " "", +/*TODO: what have these been used for? gap + ((hour - daystart) * timeline ), timeline, hourlabel, +*/ year, month, day, hour ); if (time_format == WC_TIMEFORMAT_24) { - wprintf("%2d:00 ", hour); + wc_printf("%2d:00 ", hour); } else { - wprintf("%d:00%s ", + wc_printf("%d:00%s ", (hour <= 12 ? hour : hour-12), (hour < 12 ? "am" : "pm") ); } - wprintf("
    "); + wc_printf(""); } gap = gap + ((dayend - daystart + 1) * timeline); for (hour = (dayend + 1); hour < 24; ++hour) { /* could do HEIGHT=xx */ - wprintf("
    " + wc_printf("
    " "", +/*TODO: what have these been used for? gap + ((hour - dayend - 1) * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); if (time_format == WC_TIMEFORMAT_24) { - wprintf("%2d:00 ", hour); + wc_printf("%2d:00 ", hour); } else { - wprintf("%d:00%s ", + wc_printf("%d:00%s ", (hour <= 12 ? hour : hour-12), (hour < 12 ? "am" : "pm") ); } - wprintf("
    "); + wc_printf(""); } /* Display events with start and end times on this day */ calendar_day_view_display_events(today_t, year, month, day, 0, daystart, dayend); - wprintf("
    "); - wprintf("    		"); + wc_printf(""); - wprintf("
      "); + wc_printf("
        "); /* Display all-day events */ calendar_day_view_display_events(today_t, year, month, day, 1, daystart, dayend); - wprintf("
      "); + wc_printf("
    "); - wprintf("    		"); /* begin stuff-on-the-right */ + wc_printf(""); /* begin stuff-on-the-right */ /* Begin todays-date-with-left-and-right-arrows */ - wprintf("\n"); - wprintf(""); + wc_printf("
    \n"); + wc_printf(""); - /* Left arrow */ - wprintf(""); + wc_printf("\"previous\""); + wc_printf(""); wc_strftime(d_str, sizeof d_str, - "", &d_tm ); - wprintf("%s", d_str); + wc_printf("%s", d_str); /* Right arrow */ - wprintf(""); + wc_printf("\"%s\"\n", _("next")); + wc_printf(""); - wprintf("
    "); - wprintf("", + /* Left arrow */ + wc_printf(""); + wc_printf("", yesterday.year, yesterday.month, yesterday.day); - wprintf(""); - wprintf("" - "%B
    " - "%d
    " - "%Y
    " + "    		" + "%A
    " + "%B
    " + "%d
    " + "%Y
    " "    		"); - wprintf("", + wc_printf(""); + wc_printf("", tomorrow.year, tomorrow.month, tomorrow.day); - wprintf("\n"); - wprintf("
    \n"); + wc_printf("
    \n"); /* End todays-date-with-left-and-right-arrows */ /* Embed a mini month calendar in this space */ - wprintf("
    \n"); + wc_printf("
    \n"); embeddable_mini_calendar(year, month); - wprintf("\n"); - - wprintf(""); /* end stuff-on-the-right */ - - wprintf("" /* end of inner table */ - "
    "); - - StrBufAppendPrintf(WC->trailing_javascript, - " setTimeout(\"btt_enableTooltips('inner_day')\", 1); \n" - ); + wc_printf(""); /* end stuff-on-the-right */ + wc_printf("\n"); /* end of inner table */ } @@ -1383,40 +1373,39 @@ int calendar_summary_view(void) { p = icalproperty_new_summary(_("Untitled Task")); icalcomponent_add_property(Cal->cal, p); } - if (p != NULL) { - - - if (WCC->wc_view == VIEW_TASKS) { - wprintf("CurRoom.view == VIEW_TASKS) { + wc_printf(""); + escputs(ChrPtr(WCC->CurRoom.name)); + wc_printf("\">"); } else { - wprintf(""); + escputs(ChrPtr(WCC->CurRoom.name)); + wc_printf("\">"); } escputs((char *) icalproperty_get_comment(p)); if (!all_day_event) { - wprintf(" (%s)", timestring); + wc_printf(" (%s)", timestring); } - wprintf("
    \n"); + wc_printf("
    \n"); ++num_displayed; } } @@ -1430,12 +1419,15 @@ int calendar_summary_view(void) { /* * Parse the URL variables in order to determine the scope and display of a calendar view */ -int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, - void **ViewSpecific, - long oper, - char *cmd, - long len) +int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, + void **ViewSpecific, + long oper, + char *cmd, + long len, + char *filter, + long flen) { + wcsession *WCC = WC; calview *c; time_t now; struct tm tm; @@ -1450,7 +1442,7 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, Stat->load_seen = 1; strcpy(cmd, "MSGS ALL"); Stat->maxmsgs = 32767; - + /* In case no date was specified, go with today */ now = time(NULL); localtime_r(&now, &tm); @@ -1482,7 +1474,7 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, c->view = calview_day; } else { - if (WC->wc_view == VIEW_CALBRIEF) { + if (WCC->CurRoom.view == VIEW_CALBRIEF) { c->view = calview_brief; } else { @@ -1515,10 +1507,11 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat, /* * Render a calendar view from data previously loaded into memory */ -int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, - void **ViewSpecific, +int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, + void **ViewSpecific, long oper) { + wcsession *WCC = WC; calview *c = (calview*) *ViewSpecific; if (c->view == calview_day) { @@ -1528,7 +1521,7 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, calendar_week_view(c->year, c->month, c->day); } else { - if (WC->wc_view == VIEW_CALBRIEF) { + if (WCC->CurRoom.view == VIEW_CALBRIEF) { calendar_brief_month_view(c->year, c->month, c->day); } else { @@ -1541,7 +1534,9 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, return 0; } - - - - +void +InitModule_CALENDAR_VIEW +(void) +{ + WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX); +}