#include "webserver.h"
#include "time.h"
-/** Hour strings */
+/* Hour strings */
char *hourname[] = {
"12am", "1am", "2am", "3am", "4am", "5am", "6am",
"7am", "8am", "9am", "10am", "11am", "12pm",
"7pm", "8pm", "9pm", "10pm", "11pm"
};
-/**
- * \brief display and edit date/time
+/*
* The display_icaltimetype_as_webform() and icaltime_from_webform() functions
* handle the display and editing of date/time properties in web pages. The
* first one converts an icaltimetype into valid HTML markup -- a series of form
* property (for example, a start and end time) by ensuring the field names are
* unique within the form.
*
- * \todo NOTE: These functions assume that the icaltimetype being edited is in UTC, and
+ * NOTE: These functions assume that the icaltimetype being edited is in UTC, and
* will convert to/from local time for editing. "local" in this case is assumed
* to be the time zone in which the WebCit server is running. A future improvement
* might be to allow the user to specify his/her timezone.
- * \param t the time we want to parse
- * \param prefix ???? \todo
*/
-
-void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
+void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int date_only) {
int i;
time_t now;
struct tm tm_now;
wprintf(prefix);
wprintf("\" id=\"");
wprintf(prefix);
- wprintf("\" value=\"");
- wc_strftime(timebuf, 32, "%d/%m/%Y", &tm);
+ wprintf("\" size=\"10\" maxlength=\"10\" value=\"");
+ wc_strftime(timebuf, 32, "%Y-%m-%d", &tm);
wprintf(timebuf);
wprintf("\">");
- wprintf("<script type=\"text/javascript\">");
- wprintf("attachDatePicker('");
- wprintf(prefix);
- wprintf("');\n");
- wprintf("</script>");
+
+ StrBufAppendPrintf(WC->trailing_javascript, "attachDatePicker('");
+ StrBufAppendPrintf(WC->trailing_javascript, prefix);
+ StrBufAppendPrintf(WC->trailing_javascript, "', '%s');\n", get_selected_language());
+
+ /* If we're editing a date only, we still generate the time boxes, but we hide them.
+ * This keeps the data model consistent.
+ */
+ if (date_only) {
+ wprintf("<div style=\"display:none\">");
+ }
+
wprintf(_("Hour: "));
wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
for (i=0; i<=23; ++i) {
}
}
wprintf("</SELECT>\n");
+
+ if (date_only) {
+ wprintf("</div>");
+ }
}
-/**
- *\brief Get time from form
- * get the time back from the user and convert it into internal structs.
- * \param t our time element
- * \param prefix whats that\todo ????
+/*
+ * 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), "%d/%m/%Y", &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);
- t2 = icaltime_from_string(datebuf);
+
+ /* Stuff tm with zero values */
+ memset(&tm, 0, sizeof(struct tm));
+
+ /* Get the year/month/date all in one shot */
+ strptime((char*)BSTR(prefix), "%Y-%m-%d", &tm);
+
+ /* hour */
+ sprintf(vname, "%s_hour", prefix);
+ tm.tm_hour = IBSTR(vname);
+
+ /* minute */
+ sprintf(vname, "%s_minute", prefix);
+ tm.tm_min = IBSTR(vname);
+
+ /* now convert to icaltimetyepe */
+ t2 = icaltime_from_timet_with_zone(mktime(&tm), 0, get_default_icaltimezone());
+ t2.zone = get_default_icaltimezone();
memcpy(t, &t2, sizeof(struct icaltimetype));
}
-/**
- *\brief Get time from form
- * get the time back from the user and convert it into internal structs.
- * \param t our time element
- * \param prefix whats that\todo ????
+/*
+ * 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), "%d/%m/%Y", &tm);
+
+ /* Stuff tm with zero values */
+ memset(&tm, 0, sizeof(struct tm));
+
+ /* Convert from string to icaltimetype */
+ 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));
}
-/**
- * \brief Render PAPSTAT
+/*
* Render a PARTSTAT parameter as a string (and put it in parentheses)
- * \param buf the string to put it to
- * \param attendee the attendee to textify
*/
void partstat_as_string(char *buf, icalproperty *attendee) {
icalparameter *partstat_param;
}
-/**
- * \brief embedd
+/*
* Utility function to encapsulate a subcomponent into a full VCALENDAR
- * \param subcomp the component to encapsulate
- * \returns the meta object ???
*/
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
icalcomponent *encaps;
-
- /* lprintf(9, "ical_encapsulate_subcomponent() called\n"); */
+ icalproperty *p;
+ struct icaltimetype t;
if (subcomp == NULL) {
- lprintf(3, "ERROR: called with NULL argument!\n");
+ lprintf(3, "ERROR: ical_encapsulate_subcomponent() called with NULL argument\n");
return NULL;
}
- /**
- * If we're already looking at a full VCALENDAR component,
- * don't bother ... just return itself.
+ /*
+ * 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");
return subcomp;
}
- /** Encapsulate the VEVENT component into a complete VCALENDAR */
+ /* 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)) {
+ lprintf(9, "FIXME ATTACH TIMEZONE, datetime=%s, tzid=%s\n",
+ icaltime_as_ical_string(t),
+ icaltime_get_tzid(t)
+ );
+ }
+ }
+ }
+
+ /* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
if (encaps == NULL) {
- lprintf(3, "%s:%d: Error - could not allocate component!\n",
- __FILE__, __LINE__);
+ lprintf(3, "ERROR: ical_encapsulate_subcomponent() could not allocate component\n");
return NULL;
}
- /** Set the Product ID */
+ /* Set the Product ID */
icalcomponent_add_property(encaps, icalproperty_new_prodid(PRODID));
- /** Set the Version Number */
+ /* Set the Version Number */
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
- /** Encapsulate the subcomponent inside */
- /* lprintf(9, "Doing the encapsulation\n"); */
+ /* Encapsulate the subcomponent inside */
icalcomponent_add_component(encaps, subcomp);
- /** Convert all timestamps to UTC so we don't have to deal with
- * stupid VTIMEZONE crap.
- */
- ical_dezonify(encaps);
-
- /** Return the object we just created. */
+ /* Return the object we just created. */
return(encaps);
}
-
-
projects / citadel.git / blobdiff