Added a preference setting to allow each user to choose

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 02d410749f5b51382e5718a2e04339fa32451d21..a83f8c878299a31fa8508313269cef88ca8894fc 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -195,8 +195,13 @@ void display_preferences(void)
        output_headers(1, 1, 1, 0, 0, 0);
        char ebuf[300];
        char buf[256];
-       char calhourformat[16];
        int i;
+       int time_format;
+       time_t tt;
+       struct tm tm;
+       char daylabel[32];
+       
+       time_format = get_time_format_cached ();
 
         wprintf("<div class=\"box\">\n");
         wprintf("<div class=\"boxlabel\">");
@@ -236,22 +241,23 @@ void display_preferences(void)
        wprintf("</td></tr>\n");
 
        /**
-        * Calendar hour format
+        * Time hour format
         */
-       get_preference("calhourformat", calhourformat, sizeof calhourformat);
-       if (calhourformat[0] == 0) strcpy(calhourformat, "12");
+
        wprintf("<tr class=\"odd\"><td>");
-       wprintf(_("Calendar hour format"));
+       wprintf(_("Time format"));
        wprintf("</td><td>");
 
        wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"12\"");
-       if (!strcasecmp(calhourformat, "12")) wprintf(" checked");
+       if (time_format == WC_TIMEFORMAT_AMPM) 
+               wprintf(" checked");
        wprintf(">");
        wprintf(_("12 hour (am/pm)"));
        wprintf("</input>&nbsp;&nbsp;&nbsp;");
 
        wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"24\"");
-       if (!strcasecmp(calhourformat, "24")) wprintf(" checked");
+       if (time_format == WC_TIMEFORMAT_24)
+               wprintf(" checked");
        wprintf(">");
        wprintf(_("24 hour"));
        wprintf("</input>\n");
@@ -270,7 +276,7 @@ void display_preferences(void)
        wprintf("<select name=\"daystart\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
-               if (!strcasecmp(calhourformat, "24")) {
+               if (time_format == WC_TIMEFORMAT_24) {
                        wprintf("<option %s value=\"%d\">%d:00</option>\n",
                                ((atoi(buf) == i) ? "selected" : ""),
                                i, i
@@ -299,7 +305,7 @@ void display_preferences(void)
        wprintf("<select name=\"dayend\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
-               if (!strcasecmp(calhourformat, "24")) {
+               if (time_format == WC_TIMEFORMAT_24) {
                        wprintf("<option %s value=\"%d\">%d:00</option>\n",
                                ((atoi(buf) == i) ? "selected" : ""),
                                i, i
@@ -316,12 +322,38 @@ void display_preferences(void)
        wprintf("</select>\n");
        wprintf("</td></tr>\n");
 
+       /**
+        * Day of week to begin calendar month view
+        */
+       get_preference("weekstart", buf, sizeof buf);
+       if (buf[0] == 0) strcpy(buf, "17");
+       wprintf("<tr class=\"even\"><td>");
+       wprintf(_("Week starts on:"));
+       wprintf("</td><td>");
+
+       wprintf("<select name=\"weekstart\" size=\"1\">\n");
+
+       for (i=0; i<=1; ++i) {
+                tt = time(NULL);
+                localtime_r(&tt, &tm);
+               tm.tm_wday = i;
+                wc_strftime(daylabel, sizeof daylabel, "%A", &tm);
+
+               wprintf("<option %s value=\"%d\">%s</option>\n",
+                       ((atoi(buf) == i) ? "selected" : ""),
+                       i, daylabel
+               );
+       }
+
+       wprintf("</select>\n");
+       wprintf("</td></tr>\n");
+
        /**
         * Signature
         */
        get_preference("use_sig", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "no");
-       wprintf("<tr class=\"even\"><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Attach signature to email messages?"));
        wprintf("</td><td>");
 
@@ -369,7 +401,7 @@ void display_preferences(void)
        /** Character set to assume is in use for improperly encoded headers */
        get_preference("default_header_charset", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "UTF-8");
-       wprintf("<tr class=\"odd\"><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Default character set for email headers:"));
        wprintf("</td><td>");
        wprintf("<input type=\"text\" NAME=\"default_header_charset\" MAXLENGTH=\"32\" VALUE=\"");
@@ -401,7 +433,11 @@ void display_preferences(void)
  */
 void set_preferences(void)
 {
+       char *fmt;
        char ebuf[300];
+       int *time_format_cache;
+       
+       time_format_cache = &(WC->time_format_cache);
 
        if (IsEmptyStr(bstr("change_button"))) {
                safestrncpy(WC->ImportantMessage, 
@@ -416,7 +452,14 @@ void set_preferences(void)
         * we don't send the prefs file to the server repeatedly
         */
        set_preference("roomlistview", bstr("roomlistview"), 0);
-       set_preference("calhourformat", bstr("calhourformat"), 0);
+       fmt = bstr("calhourformat");
+       set_preference("calhourformat", fmt, 0);
+       if (!strcasecmp(fmt, "24")) 
+               *time_format_cache = WC_TIMEFORMAT_24;
+       else
+               *time_format_cache = WC_TIMEFORMAT_AMPM;
+
+       set_preference("weekstart", bstr("weekstart"), 0);
        set_preference("use_sig", bstr("use_sig"), 0);
        set_preference("daystart", bstr("daystart"), 0);
        set_preference("dayend", bstr("dayend"), 0);