/*
- * $Id$
- *
* Miscellaneous functions which handle calendar components.
+ *
+ * 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"
-#include "webserver.h"
+
#include "time.h"
+#include "calendar.h"
/* Hour strings */
char *hourname[] = {
*/
void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int date_only) {
+ wcsession *WCC = WC;
int i;
time_t now;
struct tm tm_now;
- int this_year;
time_t tt;
struct tm tm;
int all_day_event = 0;
now = time(NULL);
localtime_r(&now, &tm_now);
- this_year = tm_now.tm_year + 1900;
if (t == NULL) return;
if (t->is_date) all_day_event = 1;
localtime_r(&tt, &tm);
}
- wprintf("<input type=\"text\" name=\"");
- wprintf(prefix);
- wprintf("\" id=\"");
- wprintf(prefix);
- wprintf("\" size=\"10\" maxlength=\"10\" value=\"");
+ wc_printf("<input type=\"date\" name=\"");
+ StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
+ wc_printf("\" id=\"");
+ StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
+ wc_printf("\" size=\"10\" maxlength=\"10\" value=\"");
wc_strftime(timebuf, 32, "%Y-%m-%d", &tm);
- wprintf(timebuf);
- wprintf("\">");
+ StrBufAppendBufPlain(WCC->WBuf, timebuf, -1, 0);
+ wc_printf("\">");
StrBufAppendPrintf(WC->trailing_javascript, "attachDatePicker('");
StrBufAppendPrintf(WC->trailing_javascript, prefix);
* This keeps the data model consistent.
*/
if (date_only) {
- wprintf("<div style=\"display:none\">");
+ w
c_printf("<div style=\"display:none\">");
}
- wprintf(_("Hour: "));
- wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
+ wc_printf("<span ID=\"");
+ StrBufAppendBufPlain(WCC->WBuf, prefix, -1, 0);
+ wc_printf("_time\">");
+ wc_printf(_("Hour: "));
+ wc_printf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
for (i=0; i<=23; ++i) {
if (time_format == WC_TIMEFORMAT_24) {
- wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
+ wc_printf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
((tm.tm_hour == i) ? "SELECTED" : ""),
i, i
);
}
else {
- wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
+ wc_printf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
((tm.tm_hour == i) ? "SELECTED" : ""),
i, hourname[i]
);
}
}
- wprintf("</SELECT>\n");
+ wc_printf("</SELECT>\n");
- wprintf(_("Minute: "));
- wprintf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
+ wc_printf(_("Minute: "));
+ wc_printf("<SELECT NAME=\"%s_minute\" SIZE=\"1\">\n", prefix);
for (i=0; i<=59; ++i) {
if ( (i % 5 == 0) || (tm.tm_min == i) ) {
- wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
+ wc_printf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
((tm.tm_min == i) ? "SELECTED" : ""),
i, i
);
}
}
- wprintf("</SELECT>\n");
+ wc_printf("</SELECT></span>\n");
if (date_only) {
- wprintf("</div>");
+ wc_printf("</div>");
}
}
* Get date/time from a web form and convert it into an icaltimetype struct.
*/
void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
- char datebuf[32];
char vname[32];
- struct tm tm;
-
- /* Stuff tm with some zero values */
- tm.tm_year = 0;
- tm.tm_sec = 0;
- tm.tm_min = 0;
- tm.tm_hour = 0;
- tm.tm_mday = 0;
- tm.tm_mon = 0;
- int hour = 0;
- int minute = 0;
-
- struct icaltimetype t2;
-
- strptime((char*)BSTR(prefix), "%Y-%m-%d", &tm);
- sprintf(vname, "%s_hour", prefix); hour = IBSTR(vname);
- sprintf(vname, "%s_minute", prefix); minute = IBSTR(vname);
- tm.tm_hour = hour;
- tm.tm_min = minute;
- strftime(&datebuf[0], 32, "%Y%m%dT%H%M%S", &tm);
-
- /* old
- * t2 = icaltime_from_string(datebuf);
- */
- /* unavailable
- * t2 = icaltime_from_string_with_zone(datebuf, get_default_icaltimezone() );
- */
+ if (!t) return;
+
+ /* Stuff with zero values */
+ memset(t, 0, sizeof(struct icaltimetype));
+
+ /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */
+ sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day);
- /* new */
- t2 = icaltime_from_timet_with_zone(mktime(&tm), 0, get_default_icaltimezone());
+ /* hour */
+ sprintf(vname, "%s_hour", prefix);
+ t->hour = IBSTR(vname);
- memcpy(t, &t2, sizeof(struct icaltimetype));
+ /* minute */
+ sprintf(vname, "%s_minute", prefix);
+ t->minute = IBSTR(vname);
+
+ /* time zone is set to the default zone for this server */
+ t->is_date = 0;
+ t->zone = get_default_icaltimezone();
}
* Get date (no time) from a web form and convert it into an icaltimetype struct.
*/
void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) {
- struct tm tm;
- /* Stuff tm with some zero values */
- tm.tm_sec = 0;
- tm.tm_min = 0;
- tm.tm_hour = 0;
- tm.tm_mday = 0;
- tm.tm_mon = 0;
- time_t tm_t;
- struct icaltimetype t2;
- strptime((char *)BSTR(prefix), "%Y-%m-%d", &tm);
- tm_t = mktime(&tm);
- t2 = icaltime_from_timet(tm_t, 1);
- memcpy(t, &t2, sizeof(struct icaltimetype));
+ if (!t) return;
+
+ /* Stuff with zero values */
+ memset(t, 0, sizeof(struct icaltimetype));
+
+ /* Get the year/month/date all in one shot -- it will be in ISO YYYY-MM-DD format */
+ sscanf((char*)BSTR(prefix), "%04d-%02d-%02d", &t->year, &t->month, &t->day);
+
+ /* time zone is set to the default zone for this server */
+ t->zone = icaltimezone_get_utc_timezone();
+ t->is_date = 1;
}
}
}
-
/*
- * Utility function to encapsulate a subcomponent into a full VCALENDAR
+ * Utility function to encapsulate a subcomponent into a full VCALENDAR.
+ *
+ * We also scan for any date/time properties that reference timezones, and attach
+ * those timezones along with the supplied subcomponent. (Increase the size of the array if you need to.)
+ *
+ * Note: if you change anything here, change it in Citadel server's ical_send_out_invitations() too.
*/
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
icalcomponent *encaps;
+ icalproperty *p;
+ struct icaltimetype t;
+ const icaltimezone *attached_zones[5] = { NULL, NULL, NULL, NULL, NULL };
+ int i;
+ const icaltimezone *z;
+ int num_zones_attached = 0;
+ int zone_already_attached;
if (subcomp == NULL) {
- lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
+ syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
return NULL;
}
* If we're already looking at a full VCALENDAR component, this is probably an error.
*/
if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
- lprintf(3, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
+ syslog(LOG_WARNING, "ERROR: component sent to ical_encapsulate_subcomponent() already top level\n");
return subcomp;
}
+ /* search for... */
+ for (p = icalcomponent_get_first_property(subcomp, ICAL_ANY_PROPERTY);
+ p != NULL;
+ p = icalcomponent_get_next_property(subcomp, ICAL_ANY_PROPERTY))
+ {
+ if ( (icalproperty_isa(p) == ICAL_COMPLETED_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_CREATED_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DATEMAX_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DATEMIN_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DTEND_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DTSTAMP_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DTSTART_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_DUE_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_EXDATE_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_LASTMODIFIED_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_MAXDATE_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_MINDATE_PROPERTY)
+ || (icalproperty_isa(p) == ICAL_RECURRENCEID_PROPERTY)
+ ) {
+ t = icalproperty_get_dtstart(p); /*/ it's safe to use dtstart for all of them */
+ if ((icaltime_is_valid_time(t)) && (z=icaltime_get_timezone(t), z)) {
+
+ zone_already_attached = 0;
+ for (i=0; i<5; ++i) {
+ if (z == attached_zones[i]) {
+ ++zone_already_attached;
+ syslog(LOG_DEBUG, "zone already attached!!\n");
+ }
+ }
+ if ((!zone_already_attached) && (num_zones_attached < 5)) {
+ syslog(LOG_DEBUG, "attaching zone %d!\n", num_zones_attached);
+ attached_zones[num_zones_attached++] = z;
+ }
+
+ icalproperty_set_parameter(p,
+ icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z))
+ );
+ }
+ }
+ }
+
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
if (encaps == NULL) {
- lprintf(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
+ syslog(LOG_WARNING, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
return NULL;
}
/* Set the Version Number */
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
+ /* Attach any timezones we need */
+ if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
+ icalcomponent *zc;
+ zc = icalcomponent_new_clone(icaltimezone_get_component((icaltimezone *)attached_zones[i]));
+ icalcomponent_add_component(encaps, zc);
+ }
+
/* Encapsulate the subcomponent inside */
icalcomponent_add_component(encaps, subcomp);
projects / citadel.git / blobdiff