X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=0e8ac9843385bc217f6326014f2110af9c2033cd;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=5f7de0d9e8d5d61263c432db2cdf956923c2c26f;hpb=13473e686921141b9334a90ab17f8d452ea95a74;p=citadel.git diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 5f7de0d9e..0e8ac9843 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -1,23 +1,15 @@ /* - * $Id$ - * * Handles the HTML display of calendar items. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 1996-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" @@ -42,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. @@ -96,7 +88,7 @@ void embeddable_mini_calendar(int year, int month) wc_printf("»", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("" + wc_printf("
" ""); colheader_time = thetime; for (i=0; i<7; ++i) { @@ -121,7 +113,7 @@ void embeddable_mini_calendar(int year, int month) } 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); wc_printf("", url, tm.tm_mday); } @@ -190,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) { - wc_printf("


\n"); + wc_printf("
\n"); return; } @@ -261,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")); @@ -269,7 +269,7 @@ void calendar_month_view_display_events(int year, int month, int day) if (p != NULL) { if (all_day_event) { - wc_printf("
%d
" + wc_printf("
" "
" ); } @@ -288,26 +288,26 @@ void calendar_month_view_display_events(int year, int month, int day) wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *)icalproperty_get_comment(p)); - wc_printf("
"); - + wc_printf("
"); + q = icalcomponent_get_first_property( Cal->cal, ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + 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; @@ -369,31 +369,31 @@ void calendar_month_view_display_events(int year, int month, int day) webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF); wc_printf("%s %s
", _("Ending date/time:"), buf); } - + } } - + } - + q = icalcomponent_get_first_property(Cal->cal, ICAL_DESCRIPTION_PROPERTY); if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } - + wc_printf(""); - wc_printf("
\n"); - + wc_printf("
\n"); + if (all_day_event) { wc_printf("
"); } - + } - + } - - + + } DeleteHashPos(&Pos); } @@ -418,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)) { @@ -454,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); @@ -483,20 +479,20 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { "", 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); - + wc_printf("" "%s%s", daycolor, @@ -504,10 +500,10 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) { daycolor, ebuf); } - + } - - + + } } DeleteHashPos(&Pos); @@ -571,21 +567,20 @@ void calendar_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wc_printf("
" - " \n
"); + wc_printf(" \n
"); - wc_printf("\n"); + wc_printf("
\n"); - wc_printf("
"); + wc_printf(""); localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm); wc_printf("  " - "" + "" "%s %d" "" "  ", colheader_label, year); @@ -593,20 +588,20 @@ void calendar_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); /* Inner table (the real one) */ - wc_printf(""); - wc_printf(""); + 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); - wc_printf("", colheader_label); } @@ -664,8 +659,8 @@ void calendar_month_view(int year, int month, int day) { } wc_printf("
" + wc_printf("" "%s
" /* end of inner table */ - "
" /* end of outer table */ - "\n"); + "
\n" /* end of outer table */ + ); } /* @@ -707,22 +702,21 @@ void calendar_brief_month_view(int year, int month, int day) { } /* Outer table (to get the background color) */ - wc_printf("
" - "
\n"); + wc_printf("
\n"); - wc_printf("\n"); + wc_printf("
\n"); - wc_printf("
"); + wc_printf(""); localtime_r(&previous_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\n"); + wc_printf("\"%s\"\n", _("previous")); wc_strftime(month_label, sizeof month_label, "%B", &tm); wc_printf("  " - "" + "" "%s %d" "" "  ", month_label, year); @@ -730,12 +724,12 @@ void calendar_brief_month_view(int year, int month, int day) { localtime_r(&next_month, &tm); wc_printf("", (int)(tm.tm_year)+1900, tm.tm_mon + 1); - wc_printf("\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); /* Inner table (the real one) */ - wc_printf(""); wc_printf("\n"); wc_printf("
\n"); @@ -752,8 +746,8 @@ void calendar_brief_month_view(int year, int month, int day) { if ((i % 7) == 0) { wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm); wc_printf("" - " \n", - _("Week"), + " \n", + _("Week"), weeknumber, _("Hours"), _("Subject"), @@ -761,11 +755,11 @@ 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); wc_printf("
%s %s
%s%s%s%s
%s%s%s%s
%s,%i." @@ -787,15 +781,15 @@ void calendar_brief_month_view(int year, int month, int day) { } wc_printf("
" /* end of inner table */ - "
" /* end of outer table */ - "\n"); + "
\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) { - wc_printf("
week view FIXME

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

\n"); } @@ -954,16 +948,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("All day event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("All day event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE); @@ -979,7 +973,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -998,16 +992,16 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s
", _("Ongoing event")); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s
", _("Ongoing event")); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); wc_printf("%s %s
", _("Starting date/time:"), buf); @@ -1017,7 +1011,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf(" ("); @@ -1080,15 +1074,15 @@ void calendar_day_view_display_events(time_t thetime, ); escputs((char *) icalproperty_get_comment(p)); wc_printf(""); - wc_printf("%s: %s
", _("From"), Cal->from); + wc_printf("%s: %s
", _("From"), Cal->from); wc_printf("%s ", _("Summary:")); escputs((char *) icalproperty_get_comment(p)); - wc_printf("
"); + wc_printf("
"); q = icalcomponent_get_first_property(Cal->cal,ICAL_LOCATION_PROPERTY); if (q) { wc_printf("%s ", _("Location:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } if (!icaltime_compare(t, end_t)) { /* one day only */ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF); @@ -1104,7 +1098,7 @@ void calendar_day_view_display_events(time_t thetime, if (q) { wc_printf("%s ", _("Notes:")); escputs((char *)icalproperty_get_comment(q)); - wc_printf("
"); + wc_printf("
"); } wc_printf(""); wc_printf("\n"); @@ -1141,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; @@ -1165,8 +1159,6 @@ void calendar_day_view(int year, int month, int day) { ++tomorrow.day; tomorrow = icaltime_normalize(tomorrow); - wc_printf("
"); - /* Inner table (the real one) */ wc_printf(" \n"); @@ -1181,18 +1173,14 @@ 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 */ - wc_printf("
" + wc_printf("
" "", +/* TODO: what have these been used for? (hour * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); @@ -1212,18 +1200,14 @@ void calendar_day_view(int year, int month, int day) { gap = daystart * extratimeline; for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */ - wc_printf("
" + wc_printf("
" "", +/*TODO: what have these been used for? gap + ((hour - daystart) * timeline ), timeline, hourlabel, +*/ year, month, day, hour ); @@ -1243,18 +1227,14 @@ void calendar_day_view(int year, int month, int day) { gap = gap + ((dayend - daystart + 1) * timeline); for (hour = (dayend + 1); hour < 24; ++hour) { /* could do HEIGHT=xx */ - wc_printf("
" + wc_printf("
" "", +/*TODO: what have these been used for? gap + ((hour - dayend - 1) * extratimeline ), extratimeline, extrahourlabel, +*/ year, month, day, hour ); @@ -1289,52 +1269,48 @@ void calendar_day_view(int year, int month, int day) { wc_printf(""); /* end extra on the middle */ - wc_printf("
"); /* end stuff-on-the-right */ - - wc_printf("
"); /* begin stuff-on-the-right */ + wc_printf(""); /* begin stuff-on-the-right */ /* Begin todays-date-with-left-and-right-arrows */ - wc_printf("\n"); + wc_printf("
\n"); wc_printf(""); - /* Left arrow */ - wc_printf(""); wc_strftime(d_str, sizeof d_str, - "", &d_tm ); wc_printf("%s", d_str); /* Right arrow */ - wc_printf(""); wc_printf("
"); + /* Left arrow */ + wc_printf(""); wc_printf("", yesterday.year, yesterday.month, yesterday.day); - wc_printf(""); + wc_printf("\"previous\""); wc_printf("" - "%A
" - "%B
" - "%d
" - "%Y
" + "		" + "%A
" + "%B
" + "%d
" + "%Y
" "		"); + wc_printf(""); wc_printf("", tomorrow.year, tomorrow.month, tomorrow.day); - wc_printf("\n"); + wc_printf("\"%s\"\n", _("next")); wc_printf("
\n"); /* End todays-date-with-left-and-right-arrows */ /* Embed a mini month calendar in this space */ - wc_printf("
\n"); + wc_printf("
\n"); embeddable_mini_calendar(year, month); - wc_printf("\n"); - wc_printf("
" /* end of inner table */ - "
"); + wc_printf("
\n"); /* end of inner table */ } @@ -1403,7 +1379,7 @@ int calendar_summary_view(void) { wc_printf("
\n"); + wc_printf("
\n"); ++num_displayed; } } @@ -1443,11 +1419,13 @@ 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; @@ -1464,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); @@ -1529,8 +1507,8 @@ 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; @@ -1556,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); +}