X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=1b6e8681ebe2f9f3f2deeeb3ef7b5cf666f403c7;hb=HEAD;hp=c40b5a064b957ad829680f6dc233aeefc8597606;hpb=f5c1330914acc193f96892efc191a32ee537dfb5;p=citadel.git
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index c40b5a064..c6b4a9ff3 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,33 +1,19 @@
-/*
- * Handles the HTML display of calendar items.
- *
- * Copyright (c) 1996-2010 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 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
- */
+// 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"
+
#include "calendar.h"
-/* These define how high the hour rows are in the day view */
-#define TIMELINE 30
-#define EXTRATIMELINE (TIMELINE / 2)
+// 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)
-{
+void embeddable_mini_calendar(int year, int month) {
struct tm starting_tm;
struct tm tm;
time_t thetime;
@@ -43,14 +29,11 @@ void embeddable_mini_calendar(int year, int month)
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;
@@ -60,27 +43,26 @@ 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);
}
wc_printf("
\n", div_id);
- /* Previous month link */
+ // Previous month link
localtime_r(&previous_month, &tm);
- wc_printf("
«",
- (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);
wc_printf(" "
@@ -89,13 +71,11 @@ void embeddable_mini_calendar(int year, int month)
""
" ", colheader_label, year);
- /* Next month link */
+ // Next month link
localtime_r(&next_month, &tm);
- wc_printf("
»",
- (int)(tm.tm_year)+1900, tm.tm_mon + 1);
+ wc_printf("
»", (int)(tm.tm_year)+1900, tm.tm_mon + 1);
- wc_printf("
"
- "");
+ wc_printf("");
colheader_time = thetime;
for (i=0; i<7; ++i) {
colheader_time = thetime + (i * 86400) ;
@@ -106,14 +86,13 @@ void embeddable_mini_calendar(int year, int month)
}
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) {
wc_printf("");
}
@@ -127,23 +106,23 @@ void embeddable_mini_calendar(int year, int month)
wc_printf(" | ");
}
- /* After displaying one week, end the row */
+ // After displaying one week, end the row
if ((i % 7) == 6) {
wc_printf("
\n");
}
}
- thetime += (time_t)86400; /* ahead 24 hours */
+ thetime += (time_t)86400; // ahead 24 hours
}
- wc_printf("
" /* 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"
@@ -153,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;
@@ -184,19 +158,16 @@ void calendar_month_view_display_events(int year, int month, int day)
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) {
- wc_printf(""
- "
\n ");
+ // Outer table (to get the background color)
+ wc_printf(" \n ");
wc_printf("\n");
@@ -579,7 +511,7 @@ void calendar_month_view(int year, int month, int day) {
localtime_r(&previous_month, &tm);
wc_printf("",
(int)(tm.tm_year)+1900, tm.tm_mon + 1);
- wc_printf("\n", _("previous"));
+ wc_printf("\n", _("previous"));
wc_strftime(colheader_label, sizeof colheader_label, "%B", &starting_tm);
wc_printf(" "
@@ -591,11 +523,11 @@ 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", _("next"));
+ wc_printf("\n", _("next"));
wc_printf(" \n");
- /* Inner table (the real one) */
+ // Inner table (the real one)
wc_printf("");
wc_printf(" | ");
@@ -610,12 +542,11 @@ void calendar_month_view(int year, int month, int day) {
}
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) {
wc_printf("");
wc_strftime(colheader_label, sizeof colheader_label, "%V", &tm);
@@ -639,7 +570,7 @@ void calendar_month_view(int year, int month, int day) {
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,
@@ -648,27 +579,26 @@ void calendar_month_view(int year, int month, int day) {
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) {
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
}
}
- wc_printf(" " /* end of inner table */
- " | " /* end of outer table */
- "\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;
@@ -678,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;
@@ -689,24 +618,23 @@ 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) */
- wc_printf("
\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) {
- wc_printf("
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;
@@ -825,7 +743,6 @@ 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;
@@ -843,14 +760,13 @@ void calendar_day_view_display_events(time_t thetime,
char buf[256];
- 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;
@@ -858,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;
@@ -867,20 +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;
- /*
- * Create another one without caring about the timezone for all day events.
- */
+ // 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(WCC->disp_cal_items, 0);
- while (GetNextHashPos(WCC->disp_cal_items, Pos, &hklen, &HashKey, &vCal)) {
+ // 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;
@@ -903,33 +814,26 @@ void calendar_day_view_display_events(time_t thetime,
end_t = icalproperty_get_dtend(q);
}
else {
- /* no end given means end = start */
+ // no end given means end = start
memcpy(&end_t, &t, sizeof(struct icaltimetype));
}
- if (all_day_event)
- {
+ 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 to much because we are talking about all day
- * events
- */
+ // 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);
}
event_tte = icaltime_as_timet(end_t);
localtime_r(&event_tte, &event_tm);
- /* If we determined that this event occurs today, then display it.
- */
+ // 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"));
@@ -940,8 +844,7 @@ void calendar_day_view_display_events(time_t thetime,
if ((event_te.tm_mday != day) || (event_tm.tm_mday != day)) ongoing_event = 1;
- if (all_day_event && notime_events)
- {
+ if (all_day_event && notime_events) {
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 */
+ if (!icaltime_compare(t, end_t)) { // one day only
webcit_fmt_date(buf, 256, event_tt, DATEFMT_LOCALEDATE);
wc_printf("%s %s
", _("Date:"), buf);
}
@@ -977,15 +880,16 @@ 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(" (");
wc_printf(_("All day event"));
wc_printf(")\n");
}
- else if (ongoing_event && notime_events)
- {
+
+ else if (ongoing_event && notime_events) {
+
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);
webcit_fmt_date(buf, 256, event_tte, DATEFMT_BRIEF);
@@ -1015,21 +919,21 @@ 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(" (");
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;
@@ -1043,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;
@@ -1060,7 +964,7 @@ 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
}
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 */
+ 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);
}
@@ -1102,7 +1006,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");
@@ -1112,9 +1016,8 @@ void calendar_day_view_display_events(time_t thetime,
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;
@@ -1134,20 +1037,20 @@ void calendar_day_view(int year, int month, int day) {
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;
@@ -1163,36 +1066,25 @@ void calendar_day_view(int year, int month, int day) {
++tomorrow.day;
tomorrow = icaltime_normalize(tomorrow);
- wc_printf("
");
+ 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;
@@ -1351,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) {
@@ -1361,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) {
@@ -1387,22 +1255,20 @@ 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->CurRoom.view == VIEW_TASKS) {
+ if (p != NULL) {
+ if (WC->CurRoom.view == VIEW_TASKS) {
wc_printf("
cal_msgnum
);
- escputs(ChrPtr(WCC->CurRoom.name));
+ escputs(ChrPtr(WC->CurRoom.name));
wc_printf("\">");
}
else {
@@ -1412,20 +1278,20 @@ int calendar_summary_view(void) {
"?year=%d"
"?month=%d"
"?day=%d"
- "?gotofirst=",
+ "?go=",
Cal->cal_msgnum,
today_tm.tm_year + 1900,
today_tm.tm_mon + 1,
today_tm.tm_mday
);
- escputs(ChrPtr(WCC->CurRoom.name));
+ escputs(ChrPtr(WC->CurRoom.name));
wc_printf("\">");
}
escputs((char *) icalproperty_get_comment(p));
if (!all_day_event) {
wc_printf(" (%s)", timestring);
}
- wc_printf("\n");
+ wc_printf("
\n");
++num_displayed;
}
}
@@ -1436,16 +1302,16 @@ int calendar_summary_view(void) {
return(num_displayed);
}
-/*
- * Parse the URL variables in order to determine the scope and display of a calendar view
- */
+
+// 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)
+ void **ViewSpecific,
+ long oper,
+ char *cmd,
+ long len,
+ char *filter,
+ long flen)
{
- wcsession *WCC = WC;
calview *c;
time_t now;
struct tm tm;
@@ -1461,19 +1327,19 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
strcpy(cmd, "MSGS ALL");
Stat->maxmsgs = 32767;
- /* In case no date was specified, go with today */
+ // 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(cv, bstr("calview"));
}
@@ -1481,18 +1347,18 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
strcpy(cv, "month");
}
- /* Display the selected view */
+ // Display the selected view
if (!strcasecmp(cv, "day")) {
c->view = calview_day;
}
else if (!strcasecmp(cv, "week")) {
c->view = calview_week;
}
- else if (!strcasecmp(cv, "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 (WCC->CurRoom.view == VIEW_CALBRIEF) {
+ if (WC->CurRoom.view == VIEW_CALBRIEF) {
c->view = calview_brief;
}
else {
@@ -1500,10 +1366,8 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
}
}
- /* 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;
@@ -1521,15 +1385,9 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
}
+// Render a calendar view from data previously loaded into memory
+int calendar_RenderView_or_Tail(SharedMessageStatus *Stat, void **ViewSpecific, long oper) {
-/*
- * Render a calendar view from data previously loaded into memory
- */
-int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper)
-{
- wcsession *WCC = WC;
calview *c = (calview*) *ViewSpecific;
if (c->view == calview_day) {
@@ -1539,7 +1397,7 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
calendar_week_view(c->year, c->month, c->day);
}
else {
- if (WCC->CurRoom.view == VIEW_CALBRIEF) {
+ if (WC->CurRoom.view == VIEW_CALBRIEF) {
calendar_brief_month_view(c->year, c->month, c->day);
}
else {
@@ -1547,7 +1405,14 @@ int calendar_RenderView_or_Tail(SharedMessageStatus *Stat,
}
}
- /* Free the in-memory list of calendar items */
+ // Free the in-memory list of calendar items
DeleteHash(&WC->disp_cal_items);
return 0;
}
+
+void
+InitModule_CALENDAR_VIEW
+(void)
+{
+ WebcitAddUrlHandler(HKEY("mini_calendar"), "", 0, ajax_mini_calendar, AJAX);
+}