X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=1b6e8681ebe2f9f3f2deeeb3ef7b5cf666f403c7;hb=HEAD;hp=b0155f331028d47c43c6c05c7b368b374113afda;hpb=31762c151bf4c6d106f253313c26746650d19094;p=citadel.git
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index b0155f331..c6b4a9ff3 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,18 +1,19 @@
-/*
- * $Id$
- *
- * Handles the HTML display of calendar items.
- */
+// Handles the HTML display of calendar items.
+//
+// Copyright (c) 1996-2023 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#include "webcit.h"
-#include "webserver.h"
-/* These define how high the hour rows are in the day view */
-#define TIMELINE 30
-#define EXTRATIMELINE (TIMELINE / 2)
+#include "calendar.h"
-void embeddable_mini_calendar(int year, int month)
-{
+// These define how high the hour rows are in the day view
+#define TIMELINE 22
+#define EXTRATIMELINE 22
+
+void embeddable_mini_calendar(int year, int month) {
struct tm starting_tm;
struct tm tm;
time_t thetime;
@@ -25,17 +26,14 @@ 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.
- */
+ // Determine what day to start. If an impossible value is found, start on Sunday.
get_pref_long("weekstart", &weekstart, 17);
if (weekstart > 6) weekstart = 0;
- /*
- * Now back up to the 1st of the month...
- */
+ // Now back up to the 1st of the month...
memset(&starting_tm, 0, sizeof(struct tm));
starting_tm.tm_year = year - 1900;
@@ -45,90 +43,86 @@ void embeddable_mini_calendar(int year, int month)
memcpy(&tm, &starting_tm, sizeof(struct tm));
while (tm.tm_mday != 1) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
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 */
+ // Determine previous and next months ... for links
+ previous_month = thetime - (time_t)864000; // back 10 days
+ next_month = thetime + (time_t)(31L * 86400); // ahead 31 days
- /* Now back up until we're on the user's preferred start day */
+ // Now back up until we're on the user's preferred start day
localtime_r(&thetime, &tm);
while (tm.tm_wday != weekstart) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
localtime_r(&thetime, &tm);
}
- wprintf("
\n", div_id);
+ wc_printf("
\n", div_id);
- /* Previous month link */
+ // Previous month link
localtime_r(&previous_month, &tm);
- wprintf("
«",
- (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+ 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"
""
" ", colheader_label, year);
- /* Next month link */
+ // Next month link
localtime_r(&next_month, &tm);
- wprintf("
»",
- (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+ 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("%c | ", colheader_label[0]);
+ wc_printf("%c | ", colheader_label[0]);
}
- wprintf("
\n");
+ wc_printf("\n");
-
- /* Now do 35 or 42 days */
+ // Now do 35 or 42 days
for (i = 0; i < 42; ++i) {
localtime_r(&thetime, &tm);
if (i < 35) {
- /* Before displaying Sunday, start a new row */
+ // 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("%d | ", url, tm.tm_mday);
+ wc_printf("%d | ", url, tm.tm_mday);
}
else {
- wprintf(" | ");
+ wc_printf(" | ");
}
- /* After displaying one week, end the row */
+ // After displaying one week, end the row
if ((i % 7) == 6) {
- wprintf("
\n");
+ wc_printf("\n");
}
}
- thetime += (time_t)86400; /* ahead 24 hours */
+ thetime += (time_t)86400; // ahead 24 hours
}
- wprintf("
" /* end of inner table */
+ wc_printf("
" // end of inner table
"
\n");
StrBufAppendPrintf(WC->trailing_javascript,
" function minical_change_month(year, month) { \n"
" p = 'year=' + year + '&month=' + month \n"
- " + '&r=' + CtdlRandomString(); \n"
+ " + '&r=' + ctdlRandomString(); \n"
" new Ajax.Updater('%s', 'mini_calendar', \n"
" { method: 'get', parameters: p, evalScripts: true } ); \n"
" } \n"
@@ -138,20 +132,15 @@ void embeddable_mini_calendar(int year, int month)
}
-/*
- * ajax embedder for the above mini calendar
- */
-void ajax_mini_calendar(void)
-{
+
+// ajax embedder for the above mini calendar
+void ajax_mini_calendar(void) {
embeddable_mini_calendar( ibstr("year"), ibstr("month"));
}
-/*
- * Display one day of a whole month view of a calendar
- */
-void calendar_month_view_display_events(int year, int month, int day)
-{
+// Display one day of a whole month view of a calendar
+void calendar_month_view_display_events(int year, int month, int day) {
long hklen;
const char *HashKey;
void *vCal;
@@ -163,24 +152,22 @@ void calendar_month_view_display_events(int year, int month, int day)
struct icaltimetype end_t;
struct icaltimetype today_start_t;
struct icaltimetype today_end_t;
+ struct icaltimetype today_t;
struct tm starting_tm;
struct tm ending_tm;
int all_day_event = 0;
int show_event = 0;
char buf[256];
- wcsession *WCC = WC;
time_t tt;
- if (GetCount(WCC->disp_cal_items) == 0) {
- wprintf("
\n");
+ if (GetCount(WC->disp_cal_items) == 0) {
+ wc_printf("
\n");
return;
}
- /*
- * Create an imaginary event which spans the 24 hours of today. Any events which
- * overlap with this one take place at least partially in this day. We have to
- * convert it from a struct tm in order to make it UTC.
- */
+ // Create an imaginary event which spans the 24 hours of today. Any events which
+ // overlap with this one take place at least partially in this day. We have to
+ // convert it from a struct tm in order to make it UTC.
memset(&starting_tm, 0, sizeof(struct tm));
starting_tm.tm_year = year - 1900;
starting_tm.tm_mon = month - 1;
@@ -188,7 +175,6 @@ void calendar_month_view_display_events(int year, int month, int day)
starting_tm.tm_hour = 0;
starting_tm.tm_min = 0;
today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
- today_start_t.is_utc = 1;
memset(&ending_tm, 0, sizeof(struct tm));
ending_tm.tm_year = year - 1900;
@@ -197,13 +183,16 @@ void calendar_month_view_display_events(int year, int month, int day)
ending_tm.tm_hour = 23;
ending_tm.tm_min = 59;
today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
- today_end_t.is_utc = 1;
- /*
- * Now loop through our list of events to see which ones occur today.
- */
- Pos = GetNewHashPos(WCC->disp_cal_items, 0);
- while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ // Create another one without caring about the timezone for all day events.
+ today_t = icaltime_null_date();
+ today_t.year = year;
+ today_t.month = month;
+ today_t.day = day;
+
+ // Now loop through our list of events to see which ones occur today.
+ Pos = GetNewHashPos(WC->disp_cal_items, 0);
+ while (GetNextHashPos(WC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
Cal = (disp_cal*)vCal;
all_day_event = 0;
q = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
@@ -220,126 +209,150 @@ void calendar_month_view_display_events(int year, int month, int day)
else {
memset(&end_t, 0, sizeof end_t);
}
- if (t.is_date) all_day_event = 1;
+ if (t.is_date) {
+ all_day_event = 1;
+ }
- if (all_day_event)
- {
- show_event = ((t.year == year) && (t.month == month) && (t.day == day));
+ if (all_day_event) {
+ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
}
- else
- {
+ else {
show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
}
- /*
- * If we determined that this event occurs today, then display it.
- */
+ // 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"));
+ icalcomponent_add_property(Cal->cal, p);
+ }
if (p != NULL) {
if (all_day_event) {
- wprintf("
"
+ wc_printf(""
""
);
}
- wprintf(""
+ wc_printf(""
""
+ ,
(Cal->unread)?"_unread":"_read",
Cal->cal_msgnum,
year, month, day
- );
+ );
+
+ escputs((char *) icalproperty_get_comment(p));
+
+ wc_printf("");
- wprintf("%s: %s ", _("From"), Cal->from);
- wprintf("%s ", _("Summary:"));
+ 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
- */
+
+ // 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;
+
t = icalproperty_get_dtstart(q);
-
+ q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
+ if (q != NULL) {
+ end_t = icalproperty_get_dtend(q);
+ }
+ else {
+ // events with starting date/time equal
+ // ending date/time might get only
+ // DTSTART but no DTEND
+ no_end = 1;
+ }
+
if (t.is_date) {
+ // all day event
struct tm d_tm;
- char d_str[32];
+
+ if (!no_end) {
+ // end given, have to adjust it
+ icaltime_adjust(&end_t, -1, 0, 0, 0);
+ }
memset(&d_tm, 0, sizeof d_tm);
d_tm.tm_year = t.year - 1900;
d_tm.tm_mon = t.month - 1;
d_tm.tm_mday = t.day;
- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
- wprintf("%s %s ",
- _("Date:"), d_str);
+ wc_strftime(buf, sizeof buf, "%x", &d_tm);
+
+ if (no_end || !icaltime_compare(t, end_t)) {
+ wc_printf("%s %s ", _("Date:"), buf);
+ }
+ else {
+ 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);
+ wc_printf("%s %s ", _("Ending date:"), buf);
+ }
}
else {
tt = icaltime_as_timet(t);
- webcit_fmt_date(buf, tt, 1);
- wprintf("%s %s ",
- _("Starting date/time:"), buf);
-
- /*
- * Embed the 'show end date/time' loop inside here so it
- * only executes if this is NOT an all day event.
- */
- q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
- if (q != NULL) {
- t = icalproperty_get_dtend(q);
- tt = icaltime_as_timet(t);
- webcit_fmt_date(buf, tt, 1);
- wprintf("%s %s ", _("Ending date/time:"), buf);
+ webcit_fmt_date(buf, 256, tt, DATEFMT_BRIEF);
+ if (no_end || !icaltime_compare(t, end_t)) {
+ wc_printf("%s %s ", _("Date/time:"), buf);
+ }
+ else {
+ wc_printf("%s %s ", _("Starting date/time:"), buf);
+ tt = icaltime_as_timet(end_t);
+ 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) {
- 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);
}
-/*
- * Display one day of a whole month view of a calendar
- */
+// Display one day of a whole month view of a calendar
void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
long hklen;
const char *HashKey;
@@ -348,7 +361,6 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
time_t event_tt;
time_t event_tts;
time_t event_tte;
- wcsession *WCC = WC;
struct tm event_tms;
struct tm event_tme;
struct tm today_tm;
@@ -356,23 +368,19 @@ 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)) {
+ Pos = GetNewHashPos(WC->disp_cal_items, 0);
+ while (GetNextHashPos(WC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
Cal = (disp_cal*)vCal;
p = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
@@ -388,90 +396,87 @@ void calendar_month_view_brief_events(time_t thetime, const char *daycolor) {
else {
localtime_r(&event_tts, &event_tms);
}
- /* \todo epoch &! daymask */
- if ((event_tms.tm_year == today_tm.tm_year)
+ // todo: epoch &! daymask
+ 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);
- e = icalcomponent_get_first_property(
- Cal->cal,
- ICAL_DTEND_PROPERTY);
- if ((p != NULL) && (e != NULL)) {
- time_t difftime;
- int hours, minutes;
- t = icalproperty_get_dtend(e);
- event_tte = icaltime_as_timet(t);
- localtime_r(&event_tte, &event_tme);
- difftime=(event_tte-event_tts)/60;
- hours=(int)(difftime / 60);
- minutes=difftime % 60;
- wprintf("
%i:%2i | "
- ""
- "",
- daycolor,
- hours, minutes,
- (Cal->unread)?"_unread":"_read",
- daycolor,
- Cal->cal_msgnum,
- bstr("year"),
- bstr("month"),
- bstr("day")
+ && (event_tms.tm_mday == today_tm.tm_mday))
+ {
+
+ char sbuf[255];
+ char ebuf[255];
+
+ p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
+ if (p == NULL) {
+ p = icalproperty_new_summary(_("Untitled Event"));
+ icalcomponent_add_property(Cal->cal, p);
+ }
+ e = icalcomponent_get_first_property( Cal->cal, ICAL_DTEND_PROPERTY);
+ if ((p != NULL) && (e != NULL)) {
+ time_t difftime;
+ int hours, minutes;
+ t = icalproperty_get_dtend(e);
+ event_tte = icaltime_as_timet(t);
+ localtime_r(&event_tte, &event_tme);
+ difftime=(event_tte-event_tts)/60;
+ hours=(int)(difftime / 60);
+ minutes=difftime % 60;
+ wc_printf("%i:%2i | "
+ ""
+ "",
+ daycolor,
+ hours, minutes,
+ (Cal->unread)?"_unread":"_read",
+ daycolor,
+ Cal->cal_msgnum,
+ bstr("year"),
+ bstr("month"),
+ bstr("day")
+ );
+
+ escputs((char *) icalproperty_get_comment(p));
+ // todo: also 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,
+ sbuf,
+ daycolor,
+ ebuf
);
-
- 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(" | "
- "%s | %s |
",
- daycolor,
- sbuf,
- daycolor,
- ebuf);
}
-
}
-
-
}
}
DeleteHashPos(&Pos);
}
-/*
- * view one month. pretty view
- */
+// view one month. pretty view
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;
- /*
- * Determine what day to start. If an impossible value is found, start on Sunday.
- */
+ // 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.
get_pref_long("weekstart", &weekstart, 17);
if (weekstart > 6) weekstart = 0;
- /*
- * Now back up to the 1st of the month...
- */
+ // Now back up to the 1st of the month...
memset(&starting_tm, 0, sizeof(struct tm));
starting_tm.tm_year = year - 1900;
@@ -481,133 +486,119 @@ void calendar_month_view(int year, int month, int day) {
memcpy(&tm, &starting_tm, sizeof(struct tm));
while (tm.tm_mday != 1) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
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 */
+ // Determine previous and next months ... for links
+ previous_month = thetime - (time_t)864000; // back 10 days
+ next_month = thetime + (time_t)(31L * 86400); // ahead 31 days
- /* Now back up until we're on the user's preferred start day */
+ // Now back up until we're on the user's preferred start day
localtime_r(&thetime, &tm);
while (tm.tm_wday != weekstart) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
localtime_r(&thetime, &tm);
}
- /* Outer table (to get the background color) */
- wprintf("
"
- "
\n ");
+ // Outer table (to get the background color)
+ 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("\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("\n", _("next"));
- wprintf(" | \n");
+ wc_printf(" \n");
- /* Inner table (the real one) */
- wprintf("");
+ // Inner table (the real one)
+ 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(""
+ wc_printf(" | "
"%s | ", colheader_label);
}
- wprintf(" \n");
-
+ wc_printf("\n");
- /* Now do 35 or 42 days */
+ // Now do 35 or 42 days
localtime_r(&thetime, &tm);
for (i = 0; i<42; ++i) {
- /* Before displaying the first day of the week, start a new row */
+ // Before displaying the first day of the week, start a new row
if ((i % 7) == 0) {
- wprintf("");
+ wc_printf(" ");
+ wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm);
+ wc_printf("%s ", colheader_label);
}
- wprintf(" | ",
+ wc_printf(" ",
((tm.tm_mon != month-1) ? "out" :
+ (((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"))
+ "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,
tm.tm_mday,
tm.tm_mday);
- /* put the data here, stupid */
+ // put the data here, stupid
calendar_month_view_display_events(
tm.tm_year + 1900,
tm.tm_mon + 1,
tm.tm_mday
);
- wprintf(" | ");
+ wc_printf(" | ");
- /* After displaying the last day of the week, end the row */
+ // 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 */
+ thetime += (time_t)86400; // ahead 24 hours
localtime_r(&thetime, &tm);
if ( ((i % 7) == 6) && (tm.tm_mon != month-1) && (tm.tm_mday < 15) ) {
- i = 100; /* break out of the loop */
+ i = 100; // break out of the loop
}
}
- 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
);
}
-/*
- * view one month. brief view
- */
+
+// view one month. brief view
void calendar_brief_month_view(int year, int month, int day) {
struct tm starting_tm;
struct tm tm;
@@ -617,9 +608,8 @@ void calendar_brief_month_view(int year, int month, int day) {
time_t next_month;
char month_label[32];
- /* Determine what day to start.
- * First, back up to the 1st of the month...
- */
+ // Determine what day to start.
+ // First, back up to the 1st of the month...
memset(&starting_tm, 0, sizeof(struct tm));
starting_tm.tm_year = year - 1900;
starting_tm.tm_mon = month - 1;
@@ -628,56 +618,55 @@ void calendar_brief_month_view(int year, int month, int day) {
memcpy(&tm, &starting_tm, sizeof(struct tm));
while (tm.tm_mday != 1) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
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 */
+ // Determine previous and next months ... for links
+ previous_month = thetime - (time_t)864000; // back 10 days
+ next_month = thetime + (time_t)(31L * 86400); // ahead 31 days
- /* Now back up until we're on a Sunday */
+ // Now back up until we're on a Sunday
localtime_r(&thetime, &tm);
while (tm.tm_wday != 0) {
- thetime = thetime - (time_t)86400; /* go back 24 hours */
+ thetime = thetime - (time_t)86400; // go back 24 hours
localtime_r(&thetime, &tm);
}
- /* Outer table (to get the background color) */
- wprintf("
"
- "
\n");
+ // Outer table (to get the background color)
+ 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("\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("\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 */
+ // Now do 35 days
for (i = 0; i < 35; ++i) {
char weeknumber[255];
char weekday_name[32];
@@ -685,12 +674,12 @@ void calendar_brief_month_view(int year, int month, int day) {
localtime_r(&thetime, &tm);
- /* Before displaying Sunday, start a new CELL */
+ // Before displaying Sunday, start a new CELL
if ((i % 7) == 0) {
wc_strftime(&weeknumber[0], sizeof(weeknumber), "%U", &tm);
- wprintf(" %s %s | "
- " %s | %s | %s | %s | \n",
- _("Week"),
+ wc_printf(" %s %s | "
+ " %s | %s | %s | %s | \n",
+ _("Week"),
weeknumber,
_("Hours"),
_("Subject"),
@@ -698,59 +687,49 @@ 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 */
+
+ // Day Header
wc_strftime(weekday_name, sizeof weekday_name, "%A", &tm);
- wprintf(" %s,%i."
+ wc_printf(" | %s,%i."
" |
| \n",
daycolor,
weekday_name,tm.tm_mday,
daycolor);
- /* put the data of one day here, stupid */
+ // put the data of one day here, stupid
calendar_month_view_brief_events(thetime, daycolor);
-
- /* After displaying Saturday, end the row */
+ // After displaying Saturday, end the row
if ((i % 7) == 6) {
- wprintf(" \n");
+ wc_printf(" \n");
}
- thetime += (time_t)86400; /* ahead 24 hours */
+ 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
- */
+
+// 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");
}
-/*
- * display one day
- * Display events for a particular hour of a particular day.
- * (Specify hour < 0 to show "all day" events)
- *
- * dstart and dend indicate which hours our "daytime" begins and end
- */
-void calendar_day_view_display_events(time_t thetime,
- int year,
- int month,
- int day,
- int notime_events,
- int dstart,
- int dend)
-{
+// display one day
+// Display events for a particular hour of a particular day.
+// (Specify hour < 0 to show "all day" events)
+//
+// dstart and dend indicate which hours our "daytime" begins and end
+void calendar_day_view_display_events(time_t thetime, int year, int month, int day, int notime_events, int dstart, int dend) {
+
long hklen;
const char *HashKey;
void *vCal;
@@ -764,12 +743,12 @@ void calendar_day_view_display_events(time_t thetime,
int show_event = 0;
int all_day_event = 0;
int ongoing_event = 0;
- wcsession *WCC = WC;
disp_cal *Cal;
struct icaltimetype t;
struct icaltimetype end_t;
struct icaltimetype today_start_t;
struct icaltimetype today_end_t;
+ struct icaltimetype today_t;
struct tm starting_tm;
struct tm ending_tm;
int top = 0;
@@ -780,17 +759,14 @@ void calendar_day_view_display_events(time_t thetime,
int endmin = 0;
char buf[256];
- struct tm d_tm;
- char d_str[32];
- if (GetCount(WCC->disp_cal_items) == 0) {
- /* nothing to display */
+ if (GetCount(WC->disp_cal_items) == 0) {
+ // nothing to display
return;
}
- /* Create an imaginary event which spans the current day. Any events which
- * overlap with this one take place at least partially in this day.
- */
+ // Create an imaginary event which spans the current day. Any events which
+ // overlap with this one take place at least partially in this day.
memset(&starting_tm, 0, sizeof(struct tm));
starting_tm.tm_year = year - 1900;
starting_tm.tm_mon = month - 1;
@@ -798,7 +774,6 @@ void calendar_day_view_display_events(time_t thetime,
starting_tm.tm_hour = 0;
starting_tm.tm_min = 0;
today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
- today_start_t.is_utc = 1;
memset(&ending_tm, 0, sizeof(struct tm));
ending_tm.tm_year = year - 1900;
@@ -807,12 +782,16 @@ void calendar_day_view_display_events(time_t thetime,
ending_tm.tm_hour = 23;
ending_tm.tm_min = 59;
today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
- today_end_t.is_utc = 1;
- /* Now loop through our list of events to see which ones occur today.
- */
- Pos = GetNewHashPos(WCC->disp_cal_items, 0);
- while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ // Create another one without caring about the timezone for all day events.
+ today_t = icaltime_null_date();
+ today_t.year = year;
+ today_t.month = month;
+ today_t.day = day;
+
+ // Now loop through our list of events to see which ones occur today.
+ Pos = GetNewHashPos(WC->disp_cal_items, 0);
+ while (GetNextHashPos(WC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
Cal = (disp_cal*)vCal;
all_day_event = 0;
@@ -827,116 +806,134 @@ void calendar_day_view_display_events(time_t thetime,
else {
memset(&t, 0, sizeof t);
}
+
+ if (t.is_date) all_day_event = 1;
+
q = icalcomponent_get_first_property(Cal->cal, ICAL_DTEND_PROPERTY);
if (q != NULL) {
end_t = icalproperty_get_dtend(q);
- event_tte = icaltime_as_timet(end_t);
- localtime_r(&event_tte, &event_tm);
}
else {
- memset(&end_t, 0, sizeof end_t);
+ // no end given means end = start
+ memcpy(&end_t, &t, sizeof(struct icaltimetype));
}
- if (t.is_date) all_day_event = 1;
- if (all_day_event)
- {
- show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (notime_events));
+ if (all_day_event) {
+ show_event = ical_ctdl_is_overlap(t, end_t, today_t, icaltime_null_time());
+ if (icaltime_compare(t, end_t)) {
+ // the end date is non-inclusive so adjust it by one day because our test is inclusive,
+ // note that a day is not too much because we are talking about all day events
+ icaltime_adjust(&end_t, -1, 0, 0, 0);
+ }
}
- else
- {
+ else {
show_event = ical_ctdl_is_overlap(t, end_t, today_start_t, today_end_t);
}
- /* If we determined that this event occurs today, then display it.
- */
+ event_tte = icaltime_as_timet(end_t);
+ localtime_r(&event_tte, &event_tm);
+
+ // If we determined that this event occurs today, then display it.
p = icalcomponent_get_first_property(Cal->cal,ICAL_SUMMARY_PROPERTY);
+ if (p == NULL) {
+ p = icalproperty_new_summary(_("Untitled Event"));
+ icalcomponent_add_property(Cal->cal, p);
+ }
if ((show_event) && (p != NULL)) {
if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1;
- if (all_day_event && notime_events)
- {
- wprintf("
"
+ if (all_day_event && notime_events) {
+ 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("
");
- }
- memset(&d_tm, 0, sizeof d_tm);
- d_tm.tm_year = t.year - 1900;
- d_tm.tm_mon = t.month - 1;
- d_tm.tm_mday = t.day;
- wc_strftime(d_str, sizeof d_str, "%x", &d_tm);
- wprintf("%s %s
",_("Date:"), d_str);
+ wc_printf("
");
+ }
+ if (!icaltime_compare(t, end_t)) { // one day only
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+ wc_printf("%s %s
", _("Date:"), buf);
+ }
+ else {
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
+ wc_printf("%s %s
", _("Starting date:"), buf);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_LOCALEDATE);
+ 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("
"
+
+ else if (ongoing_event && notime_events) {
+
+ 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("
");
- }
- webcit_fmt_date(buf, event_tt, 1);
- wprintf("%s %s
", _("Starting date/time:"), buf);
- webcit_fmt_date(buf, event_tte, 1);
- wprintf("%s %s
", _("Ending date/time:"), buf);
+ wc_printf("
");
+ }
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+ wc_printf("%s %s
", _("Starting date/time:"), buf);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
+ 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)
- {
+
+ else if (!all_day_event && !notime_events) {
gap++;
if (event_te.tm_mday != day) event_te.tm_hour = 0;
if (event_tm.tm_mday != day) event_tm.tm_hour = 24;
- /* Calculate the location of the top of the box */
+ // Calculate the location of the top of the box
if (event_te.tm_hour < dstart) {
startmin = diffmin = event_te.tm_min / 6;
top = (event_te.tm_hour * EXTRATIMELINE) + startmin;
@@ -950,10 +947,10 @@ void calendar_day_view_display_events(time_t thetime,
top = (dstart * EXTRATIMELINE) + ((dend - dstart - 1) * TIMELINE) + ((event_tm.tm_hour - dend + 1) * EXTRATIMELINE) + startmin ;
}
else {
- /* should never get here */
+ // should never get here
}
- /* Calculate the location of the bottom of the box */
+ // Calculate the location of the bottom of the box
if (event_tm.tm_hour < dstart) {
endmin = diffmin = event_tm.tm_min / 6;
bottom = (event_tm.tm_hour * EXTRATIMELINE) + endmin;
@@ -967,85 +964,93 @@ void calendar_day_view_display_events(time_t thetime,
bottom = (dstart * EXTRATIMELINE) + ((dend - dstart + 1) * TIMELINE) + ((event_tm.tm_hour - dend - 1) * EXTRATIMELINE) + endmin;
}
else {
- /* should never get here */
+ // 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("
");
}
- webcit_fmt_date(buf, event_tt, 1);
- wprintf("%s %s
", _("Starting date/time:"), buf);
- webcit_fmt_date(buf, event_tte, 1);
- wprintf("%s %s
", _("Ending date/time:"), buf);
+ if (!icaltime_compare(t, end_t)) { // one day only
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+ wc_printf("%s %s
", _("Date/time:"), buf);
+ }
+ else {
+ webcit_fmt_date(buf, 256, event_tt, DATEFMT_BRIEF);
+ wc_printf("%s %s
", _("Starting date/time:"), buf);
+ webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
+ 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");
}
}
}
DeleteHashPos(&Pos);
}
-/*
- * view one day
- */
+
+// view one day
void calendar_day_view(int year, int month, int day) {
int hour;
struct icaltimetype today, yesterday, tomorrow;
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;
int extratimeline = EXTRATIMELINE;
int gap = 0;
+ int hourlabel;
+ int extrahourlabel;
time_format = get_time_format_cached ();
get_pref_long("daystart", &daystart, 8);
get_pref_long("dayend", &dayend, 17);
- /* when loading daystart/dayend, replace missing, corrupt, or impossible values with defaults */
+ // when loading daystart/dayend, replace missing, corrupt, or impossible values with defaults
if ((daystart < 0) || (dayend < 2) || (daystart >= 23) || (dayend > 23) || (dayend <= daystart)) {
daystart = 9;
dayend = 17;
}
-
- /* Today's date */
+
+ // Today's date
memset(&d_tm, 0, sizeof d_tm);
d_tm.tm_year = year - 1900;
d_tm.tm_mon = month - 1;
d_tm.tm_mday = day;
today_t = mktime(&d_tm);
- /* Figure out the dates for "yesterday" and "tomorrow" links */
+ // Figure out the dates for "yesterday" and "tomorrow" links
memset(&today, 0, sizeof(struct icaltimetype));
today.year = year;
@@ -1061,181 +1066,146 @@ void calendar_day_view(int year, int month, int day) {
++tomorrow.day;
tomorrow = icaltime_normalize(tomorrow);
- wprintf("
");
+ // Inner table (the real one)
+ wc_printf("
\n");
- /* Inner table (the real one) */
- wprintf(" \n");
+ // Innermost cell (contains hours etc.)
+ wc_printf("");
+ wc_printf("");
- /* Innermost cell (contains hours etc.) */
- wprintf("");
- wprintf("");
+ // Now the middle of the day...
- /* Now the middle of the day... */
+ extrahourlabel = extratimeline - 2;
+ hourlabel = extrahourlabel * 150 / 100;
+ if (hourlabel > (timeline - 2)) hourlabel = timeline - 2;
- for (hour = 0; hour < daystart; ++hour) { /* could do HEIGHT=xx */
- wprintf("");
}
gap = daystart * extratimeline;
- for (hour = daystart; hour <= dayend; ++hour) { /* could do HEIGHT=xx */
- wprintf("- "
+ for (hour = daystart; hour <= dayend; ++hour) { // could do HEIGHT=xx
+ wc_printf("
- "
"",
- gap + ((hour - daystart) * timeline ),
- timeline,
- timeline - 2,
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("");
}
- /* Display events with start and end times on this day */
+ // 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(" | "); /* 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(""); /* begin stuff-on-the-right */
+ wc_printf(" | "); // begin stuff-on-the-right
- /* Begin todays-date-with-left-and-right-arrows */
- wprintf("\n");
- wprintf("");
+ // Begin todays-date-with-left-and-right-arrows
+ wc_printf("\n");
+ wc_printf("");
- /* Left arrow */
- wprintf("");
- wprintf("",
- yesterday.year, yesterday.month, yesterday.day);
- wprintf("");
- wprintf(" | ");
+ // Left arrow
+ wc_printf("");
+ wc_printf("", yesterday.year, yesterday.month, yesterday.day);
+ wc_printf("");
+ wc_printf(" | ");
wc_strftime(d_str, sizeof d_str,
- ""
- "%B "
- "%d "
- "%Y "
+ " | "
+ "%A "
+ "%B "
+ "%d "
+ "%Y "
" | ",
&d_tm
- );
- wprintf("%s", d_str);
+ );
+ wc_printf("%s", d_str);
- /* Right arrow */
- wprintf("");
- wprintf("",
+ // Right arrow
+ wc_printf(" | ");
+ wc_printf("",
tomorrow.year, tomorrow.month, tomorrow.day);
- wprintf("\n");
- wprintf(" | ");
+ wc_printf("\n", _("next"));
+ wc_printf("");
- wprintf(" \n");
- /* End todays-date-with-left-and-right-arrows */
+ wc_printf(" \n");
+ // End todays-date-with-left-and-right-arrows
- /* Embed a mini month calendar in this space */
- wprintf(" \n");
+ // Embed a mini month calendar in this space
+ 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
}
-/*
- * Display today's events. Returns the number of items displayed.
- */
+// Display today's events. Returns the number of items displayed.
int calendar_summary_view(void) {
long hklen;
const char *HashKey;
@@ -1250,7 +1220,6 @@ int calendar_summary_view(void) {
time_t now;
int all_day_event = 0;
char timestring[SIZ];
- wcsession *WCC = WC;
int num_displayed = 0;
if (GetCount(WC->disp_cal_items) == 0) {
@@ -1260,8 +1229,8 @@ int calendar_summary_view(void) {
now = time(NULL);
localtime_r(&now, &today_tm);
- Pos = GetNewHashPos(WCC->disp_cal_items, 0);
- while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ Pos = GetNewHashPos(WC->disp_cal_items, 0);
+ while (GetNextHashPos(WC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
Cal = (disp_cal*)vCal;
p = icalcomponent_get_first_property(Cal->cal, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
@@ -1273,7 +1242,7 @@ int calendar_summary_view(void) {
else {
all_day_event = 0;
}
- fmt_time(timestring, event_tt);
+ fmt_time(timestring, SIZ, event_tt);
if (all_day_event) {
gmtime_r(&event_tt, &event_tm);
@@ -1286,42 +1255,43 @@ int calendar_summary_view(void) {
&& (event_tm.tm_mon == today_tm.tm_mon)
&& (event_tm.tm_mday == today_tm.tm_mday)
) {
-
p = icalcomponent_get_first_property(Cal->cal, ICAL_SUMMARY_PROPERTY);
+ if (p == NULL) {
+ 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("cal_msgnum
);
- escputs(ChrPtr(WCC->wc_roomname));
- wprintf("\">");
+ escputs(ChrPtr(WC->CurRoom.name));
+ wc_printf("\">");
}
else {
- wprintf("cal_msgnum,
today_tm.tm_year + 1900,
today_tm.tm_mon + 1,
today_tm.tm_mday
);
- escputs(ChrPtr(WCC->wc_roomname));
- wprintf("\">");
+ escputs(ChrPtr(WC->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;
}
}
@@ -1332,47 +1302,63 @@ int calendar_summary_view(void) {
return(num_displayed);
}
-/*
- * Parse the URL variables in order to determine the scope and display of a calendar view
- */
-void parse_calendar_view_request(struct calview *c) {
+
+// 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,
+ char *filter,
+ long flen)
+{
+ calview *c;
time_t now;
struct tm tm;
- char calview[32];
+ char cv[32];
+
int span = 3888000;
- /* In case no date was specified, go with today */
+ c = (calview*) malloc(sizeof(calview));
+ memset(c, 0, sizeof(calview));
+ *ViewSpecific = (void*)c;
+
+ 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);
c->year = tm.tm_year + 1900;
c->month = tm.tm_mon + 1;
c->day = tm.tm_mday;
- /* Now see if a date was specified */
+ // Now see if a date was specified
if (havebstr("year")) c->year = ibstr("year");
if (havebstr("month")) c->month = ibstr("month");
if (havebstr("day")) c->day = ibstr("day");
- /* How would you like that cooked? */
+ // How would you like that cooked?
if (havebstr("calview")) {
- strcpy(calview, bstr("calview"));
+ strcpy(cv, bstr("calview"));
}
else {
- strcpy(calview, "month");
+ strcpy(cv, "month");
}
- /* Display the selected view */
- if (!strcasecmp(calview, "day")) {
+ // Display the selected view
+ if (!strcasecmp(cv, "day")) {
c->view = calview_day;
}
- else if (!strcasecmp(calview, "week")) {
+ else if (!strcasecmp(cv, "week")) {
c->view = calview_week;
}
- else if (!strcasecmp(calview, "summary")) { /* shouldn't ever happen, but just in case */
+ else if (!strcasecmp(cv, "summary")) { // shouldn't ever happen, but just in case
c->view = calview_day;
}
else {
- if (WC->wc_view == VIEW_CALBRIEF) {
+ if (WC->CurRoom.view == VIEW_CALBRIEF) {
c->view = calview_brief;
}
else {
@@ -1380,10 +1366,8 @@ void parse_calendar_view_request(struct calview *c) {
}
}
- /* Now try and set the lower and upper bounds so that we don't
- * burn too many cpu cycles parsing data way in the past or future
- */
-
+ // Now try and set the lower and upper bounds so that we don't
+ // burn too many cpu cycles parsing data way in the past or future
tm.tm_year = c->year - 1900;
tm.tm_mon = c->month - 1;
tm.tm_mday = c->day;
@@ -1397,15 +1381,15 @@ void parse_calendar_view_request(struct calview *c) {
c->lower_bound = now - span;
c->upper_bound = now + span;
+ return 200;
}
+// Render a calendar view from data previously loaded into memory
+int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, long oper) {
+
+ calview *c = (calview*) *ViewSpecific;
-/*
- * Render a calendar view from data previously loaded into memory
- */
-void render_calendar_view(struct calview *c)
-{
if (c->view == calview_day) {
calendar_day_view(c->year, c->month, c->day);
}
@@ -1413,7 +1397,7 @@ void render_calendar_view(struct calview *c)
calendar_week_view(c->year, c->month, c->day);
}
else {
- if (WC->wc_view == VIEW_CALBRIEF) {
+ if (WC->CurRoom.view == VIEW_CALBRIEF) {
calendar_brief_month_view(c->year, c->month, c->day);
}
else {
@@ -1421,170 +1405,14 @@ void render_calendar_view(struct calview *c)
}
}
- /* Free the in-memory list of calendar items */
+ // Free the in-memory list of calendar items
DeleteHash(&WC->disp_cal_items);
-}
-
-
-/*
- * Helper function for do_tasks_view(). Returns the due date/time of a vtodo.
- */
-time_t get_task_due_date(icalcomponent *vtodo) {
- icalproperty *p;
-
- if (vtodo == NULL) {
- return(0L);
- }
-
- /*
- * 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 *vtask1, const void *vtask2) {
- disp_cal * Task1 = (disp_cal *)GetSearchPayload(vtask1);
- disp_cal * Task2 = (disp_cal *)GetSearchPayload(vtask2);
-
- time_t t1;
- time_t t2;
-
- t1 = get_task_due_date(Task1->cal);
- t2 = get_task_due_date(Task2->cal);
- if (t1 < t2) return(-1);
- if (t1 > t2) return(1);
- return(0);
-}
-
-/*
- * qsort filter to move completed tasks to bottom of task list
- */
-int task_completed_cmp(const void *vtask1, const void *vtask2) {
- disp_cal * Task1 = (disp_cal *)GetSearchPayload(vtask1);
-/* disp_cal * Task2 = (disp_cal *)GetSearchPayload(vtask2); */
-
- icalproperty_status t1 = icalcomponent_get_status((Task1)->cal);
- /* icalproperty_status t2 = icalcomponent_get_status(((struct disp_cal *)task2)->cal); */
-
- if (t1 == ICAL_STATUS_COMPLETED)
- return 1;
return 0;
}
-
-
-/*
- * do the whole task view stuff
- */
-void do_tasks_view(void) {
- long hklen;
- const char *HashKey;
- void *vCal;
- disp_cal *Cal;
- HashPos *Pos;
- int nItems;
- time_t due;
- char buf[SIZ];
- icalproperty *p;
- wcsession *WCC = WC;
-
- wprintf("
\n");
-
- /* Free the list */
- DeleteHash(&WC->disp_cal_items);
- DeleteHashPos(&Pos);
+void
+InitModule_CALENDAR_VIEW
+(void)
+{
+ WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
}
-