]> code.citadel.org Git - citadel.git/blobdiff - webcit/calendar_tools.c
Calendar date format is now yyyy-mm-dd because that is the
[citadel.git] / webcit / calendar_tools.c
index 58e62146f4515055f2e0c60b71107f048be19d06..23dd53524b8f435ce131a47aa96b29202c2f671f 100644 (file)
@@ -1,15 +1,14 @@
 /*
  * $Id$
+ *
+ * Miscellaneous functions which handle calendar components.
  */
-/**
- * \defgroup MiscCal Miscellaneous functions which handle calendar components.
- * \ingroup Calendaring
- */
-/*@{*/
+
 #include "webcit.h"
 #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",
@@ -17,10 +16,7 @@ char *hourname[] = {
        "7pm", "8pm", "9pm", "10pm", "11pm"
 };
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
- * \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
@@ -31,15 +27,12 @@ char *hourname[] = {
  * 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) {
        int i;
        time_t now;
@@ -47,11 +40,11 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
        int this_year;
        time_t tt;
        struct tm tm;
-       const int span = 10;
        int all_day_event = 0;
-       char calhourformat[16];
-
-       get_preference("calhourformat", calhourformat, sizeof calhourformat);
+       int time_format;
+       char timebuf[32];
+       
+       time_format = get_time_format_cached ();
 
        now = time(NULL);
        localtime_r(&now, &tm_now);
@@ -67,60 +60,34 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
                localtime_r(&tt, &tm);
        }
 
-       wprintf(_("Month: "));
-       wprintf("<SELECT NAME=\"%s_month\" SIZE=\"1\">\n", prefix);
-       for (i=0; i<=11; ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
-                       ((tm.tm_mon == i) ? "SELECTED" : ""),
-                       i+1,
-                       monthname(i)
-               );
-       }
-       wprintf("</SELECT>\n");
-
-       wprintf(_("Day: "));
-       wprintf("<SELECT NAME=\"%s_day\" SIZE=\"1\">\n", prefix);
-       for (i=1; i<=31; ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
-                       ((tm.tm_mday == i) ? "SELECTED" : ""),
-                       i, i
-               );
-       }
-       wprintf("</SELECT>\n");
-
-       wprintf(_("Year: "));
-       wprintf("<SELECT NAME=\"%s_year\" SIZE=\"1\">\n", prefix);
-       if ((this_year - t->year) > span) {
-               wprintf("<OPTION SELECTED VALUE=\"%d\">%d</OPTION>\n",
-                       t->year, t->year);
-       }
-       for (i=(this_year-span); i<=(this_year+span); ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
-                       ((t->year == i) ? "SELECTED" : ""),
-                       i, i
-               );
-       }
-       if ((t->year - this_year) > span) {
-               wprintf("<OPTION SELECTED VALUE=\"%d\">%d</OPTION>\n",
-                       t->year, t->year);
-       }
-       wprintf("</SELECT>\n");
-
+       wprintf("<input type=\"text\" name=\"");
+       wprintf(prefix);
+       wprintf("\" id=\"");
+       wprintf(prefix);
+       wprintf("\" 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>");
        wprintf(_("Hour: "));
        wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
        for (i=0; i<=23; ++i) {
 
-               if (!strcasecmp(calhourformat, "24")) {
+               if (time_format == WC_TIMEFORMAT_24) {
                        wprintf("<OPTION %s VALUE=\"%d\">%d</OPTION>\n",
                                ((tm.tm_hour == i) ? "SELECTED" : ""),
                                i, i
-                       );
+                               );
                }
                else {
                        wprintf("<OPTION %s VALUE=\"%d\">%s</OPTION>\n",
                                ((tm.tm_hour == i) ? "SELECTED" : ""),
                                i, hourname[i]
-                       );
+                               );
                }
 
        }
@@ -133,60 +100,66 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
                        wprintf("<OPTION %s VALUE=\"%d\">:%02d</OPTION>\n",
                                ((tm.tm_min == i) ? "SELECTED" : ""),
                                i, i
-                       );
+                               );
                }
        }
        wprintf("</SELECT>\n");
 }
 
-/**
- *\brief Get time from form
+/*
+ * 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 ????
  */
 void icaltime_from_webform(struct icaltimetype *t, char *prefix) {
-       char vname[32];
-        time_t tt;
-        struct tm tm;
-       struct icaltimetype t2;
-
-        tt = time(NULL);
-        localtime_r(&tt, &tm);
-
-        sprintf(vname, "%s_month", prefix);     tm.tm_mon = atoi(bstr(vname)) - 1;
-        sprintf(vname, "%s_day", prefix);       tm.tm_mday = atoi(bstr(vname));
-        sprintf(vname, "%s_year", prefix);      tm.tm_year = atoi(bstr(vname)) - 1900;
-        sprintf(vname, "%s_hour", prefix);      tm.tm_hour = atoi(bstr(vname));
-        sprintf(vname, "%s_minute", prefix);    tm.tm_min = atoi(bstr(vname));
-
-        tt = mktime(&tm);
-        t2 = icaltime_from_timet(tt, 0);
-       memcpy(t, &t2, sizeof(struct icaltimetype));
+       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);
+       t2 = icaltime_from_string(datebuf);
+       memcpy(t, &t2, sizeof(struct icaltimetype));
 }
 
-/**
- *\brief Get time from form
+
+/*
+ * 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 ????
  */
-
 void icaltime_from_webform_dateonly(struct icaltimetype *t, char *prefix) {
-       char vname[32];
-
-       memset(t, 0, sizeof(struct icaltimetype));
-
-        sprintf(vname, "%s_month", prefix);     t->month = atoi(bstr(vname));
-        sprintf(vname, "%s_day", prefix);       t->day = atoi(bstr(vname));
-        sprintf(vname, "%s_year", prefix);      t->year = atoi(bstr(vname));
-       t->is_utc = 1;
-       t->is_date = 1;
+       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));
 }
 
 
 /**
- * \brief Render PAPSTAT
+ * \brief Render PARTSTAT
  * 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
@@ -198,51 +171,48 @@ void partstat_as_string(char *buf, icalproperty *attendee) {
        strcpy(buf, _("(status unknown)"));
 
        partstat_param = icalproperty_get_first_parameter(
-                               attendee,
-                               ICAL_PARTSTAT_PARAMETER
-       );
+               attendee,
+               ICAL_PARTSTAT_PARAMETER
+               );
        if (partstat_param == NULL) {
                return;
        }
 
        partstat = icalparameter_get_partstat(partstat_param);
        switch(partstat) {
-               case ICAL_PARTSTAT_X:
-                       strcpy(buf, "(x)");
-                       break;
-               case ICAL_PARTSTAT_NEEDSACTION:
-                       strcpy(buf, _("(needs action)"));
-                       break;
-               case ICAL_PARTSTAT_ACCEPTED:
-                       strcpy(buf, _("(accepted)"));
-                       break;
-               case ICAL_PARTSTAT_DECLINED:
-                       strcpy(buf, _("(declined)"));
-                       break;
-               case ICAL_PARTSTAT_TENTATIVE:
-                       strcpy(buf, _("(tenative)"));
-                       break;
-               case ICAL_PARTSTAT_DELEGATED:
-                       strcpy(buf, _("(delegated)"));
-                       break;
-               case ICAL_PARTSTAT_COMPLETED:
-                       strcpy(buf, _("(completed)"));
-                       break;
-               case ICAL_PARTSTAT_INPROCESS:
-                       strcpy(buf, _("(in process)"));
-                       break;
-               case ICAL_PARTSTAT_NONE:
-                       strcpy(buf, _("(none)"));
-                       break;
+       case ICAL_PARTSTAT_X:
+               strcpy(buf, "(x)");
+               break;
+       case ICAL_PARTSTAT_NEEDSACTION:
+               strcpy(buf, _("(needs action)"));
+               break;
+       case ICAL_PARTSTAT_ACCEPTED:
+               strcpy(buf, _("(accepted)"));
+               break;
+       case ICAL_PARTSTAT_DECLINED:
+               strcpy(buf, _("(declined)"));
+               break;
+       case ICAL_PARTSTAT_TENTATIVE:
+               strcpy(buf, _("(tenative)"));
+               break;
+       case ICAL_PARTSTAT_DELEGATED:
+               strcpy(buf, _("(delegated)"));
+               break;
+       case ICAL_PARTSTAT_COMPLETED:
+               strcpy(buf, _("(completed)"));
+               break;
+       case ICAL_PARTSTAT_INPROCESS:
+               strcpy(buf, _("(in process)"));
+               break;
+       case ICAL_PARTSTAT_NONE:
+               strcpy(buf, _("(none)"));
+               break;
        }
 }
 
 
-/**
- * \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;
@@ -254,7 +224,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                return NULL;
        }
 
-       /**
+       /*
         * If we're already looking at a full VCALENDAR component,
         * don't bother ... just return itself.
         */
@@ -262,7 +232,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                return subcomp;
        }
 
-       /** Encapsulate the VEVENT component into a complete VCALENDAR */
+       /* 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",
@@ -270,27 +240,21 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
                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 */
+       /* Encapsulate the subcomponent inside */
        /* lprintf(9, "Doing the encapsulation\n"); */
        icalcomponent_add_component(encaps, subcomp);
 
-       /** Convert all timestamps to UTC so we don't have to deal with
+       /* 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);
 }
-
-
-
-
-#endif
-/*@}*/