* add name of callback hook for logging (yes, I LOVE XMACROS)

[citadel.git] / webcit / fmt_date.c

diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index 6fd92f749c71850b3593ea6857273b85e20ee5d6..2bd49af452e16e3c28dc874456c02e5f97d08bf6 100644 (file)
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -5,6 +5,10 @@
 #include "webcit.h"
 #include "webserver.h"
 
+#ifdef HAVE_USELOCALE
+extern locale_t wc_locales[];
+#endif
+
 typedef unsigned char byte;
 
 #define FALSE 0 /**< no. */
@@ -21,19 +25,25 @@ typedef unsigned char byte;
  */
 size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm)
 {
+
 #ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
        if (wc_locales[WC->selected_language] == NULL) {
                return strftime(s, max, format, tm);
        }
-       else { // TODO: this gives empty strings on debian.
+       else { /* TODO: this gives empty strings on debian. */
                return strftime_l(s, max, format, tm, wc_locales[WC->selected_language]);
        }
 #else
        return strftime(s, max, format, tm);
 #endif
+#else
+       return strftime(s, max, format, tm);
+#endif
 }
 
 
+
 /*
  * Format a date/time stamp for output 
  */
@@ -82,18 +92,42 @@ void webcit_fmt_date(char *buf, time_t thetime, int brief)
 }
 
 
+/* 
+ * Try to guess whether the user will prefer 12 hour or 24 hour time based on the locale.
+ */
+long guess_calhourformat(void) {
+       char buf[32];
+       struct tm tm;
+       memset(&tm, 0, sizeof tm);
+       wc_strftime(buf, 32, "%X", &tm);
+       if (buf[strlen(buf)-1] == 'M') {
+               return 12;
+       }
+       return 24;
+}
+
+
 /*
  * learn the users timeformat preference.
  */
 int get_time_format_cached (void)
 {
-       char calhourformat[16];
+       long calhourformat;
        int *time_format_cache;
        time_format_cache = &(WC->time_format_cache);
        if (*time_format_cache == WC_TIMEFORMAT_NONE)
        {
-               get_preference("calhourformat", calhourformat, sizeof calhourformat);
-               if (!strcasecmp(calhourformat, "24")) 
+               get_pref_long("calhourformat", &calhourformat, 99);
+
+               /* If we don't know the user's time format preference yet,
+                * make a guess based on the locale.
+                */
+               if (calhourformat == 99) {
+                       calhourformat = guess_calhourformat();
+               }
+
+               /* Now set the preference */
+               if (calhourformat == 24) 
                        *time_format_cache = WC_TIMEFORMAT_24;
                else
                        *time_format_cache = WC_TIMEFORMAT_AMPM;
@@ -122,7 +156,7 @@ void fmt_time(char *buf, time_t thetime)
                hour = hour - 12;
 
        if (time_format == WC_TIMEFORMAT_24) {
-               sprintf(buf, "%2d:%02d",
+               sprintf(buf, "%d:%02d",
                        tm->tm_hour, tm->tm_min
                );
        }
@@ -142,16 +176,18 @@ void fmt_time(char *buf, time_t thetime)
  * FIXME won't read asctime
  * Doesn't understand timezone, but we only should be using GMT/UTC anyway
  */
-time_t httpdate_to_timestamp(char *buf)
+time_t httpdate_to_timestamp(StrBuf *buf)
 {
        time_t t = 0;
        struct tm tt;
-       char *c;
+       const char *c;
 
        /** Skip day of week, to number */
-       for (c = buf; *c != ' '; c++)
+       for (c = ChrPtr(buf); *c != ' '; c++)
                ;
        c++;
+       
+       memset(&tt, 0, sizeof(tt));
 
        /* Get day of month */
        tt.tm_mday = atoi(c);
@@ -213,14 +249,37 @@ time_t httpdate_to_timestamp(char *buf)
        for (; *c && *c != ' '; c++);
 
        /* Got everything; let's go.  The global 'timezone' variable contains the
-        * local timezone's offset from UTC, in seconds, so we add that to tm_sec.
+        * local timezone's offset from UTC, in seconds, so we apply that to tm_sec.
         * This produces an illegal value for tm_sec, but mktime() will normalize
         * it for us.  This eliminates the need to temporarily switch the environment
         * variable TZ to UTC, which is good because it fails to switch back on
         * some systems.
         */
        tzset();
-       tt.tm_sec += timezone;
+       tt.tm_sec = tt.tm_sec - (int)timezone;
        t = mktime(&tt);
        return t;
 }
+
+
+void LoadTimeformatSettingsCache(StrBuf *Preference, long lvalue)
+{
+       int *time_format_cache;
+       
+        time_format_cache = &(WC->time_format_cache);
+        if (lvalue == 24) 
+                *time_format_cache = WC_TIMEFORMAT_24;
+        else
+                *time_format_cache = WC_TIMEFORMAT_AMPM;
+}
+
+
+
+void 
+InitModule_DATETIME
+(void)
+{
+       RegisterPreference("calhourformat", _("Time format"), PRF_INT, LoadTimeformatSettingsCache);
+
+
+}