]> code.citadel.org Git - citadel.git/blobdiff - webcit/preferences.c
Fixed the webcit preferences bug once and for all, using a proper
[citadel.git] / webcit / preferences.c
index 342477123553b33ea209e83758d3916b9d7c596d..8991c0c13f06e98d53f2f3e71b2a81590f2d9d36 100644 (file)
@@ -7,11 +7,46 @@
 
 #include "webcit.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 
+/* This function is for private use -- callers should use set_preference() instead
+ */
+void store_preference(char *key, char *value) {
+
+       struct wcpref *ptr = NULL;
 
+       if (WC->first_pref == NULL) {
+               WC->first_pref = malloc(sizeof(struct wcpref));
+               WC->first_pref->next = NULL;
+               WC->first_pref->pref_key = strdup(key);
+               WC->first_pref->pref_value = strdup(value);
+               return;
+       }
+
+       for (ptr = WC->first_pref; ptr != NULL; ptr = ptr->next) {
+               if (!strcasecmp(ptr->pref_key, key)) {
+                       free(ptr->pref_value);
+                       ptr->pref_value = strdup(value);
+                       return;
+               }
+       }
+
+       ptr = malloc(sizeof(struct wcpref));
+       ptr->pref_key = strdup(key);
+       ptr->pref_value = strdup(value);
+       ptr->next = WC->first_pref;
+       WC->first_pref = ptr;
+}
+
+
+/*
+ * display preferences dialog
+ */
 void load_preferences(void) {
        char buf[SIZ];
+       char key[SIZ];
+       char value[SIZ];
        long msgnum = 0L;
 
        serv_printf("GOTO %s", USERCONFIGROOM);
@@ -37,19 +72,9 @@ void load_preferences(void) {
                        }
                        if (!strcmp(buf, "text")) {
                                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                                       if (WC->preferences == NULL) {
-                                               WC->preferences = malloc(SIZ);
-                                               strcpy(WC->preferences, "");
-                                       }
-                                       else {
-                                               WC->preferences = realloc(
-                                                       WC->preferences,
-                                                       strlen(WC->preferences)
-                                                       +SIZ
-                                               );
-                                       }
-                                       strcat(WC->preferences, buf);
-                                       strcat(WC->preferences, "\n");
+                                       extract_token(key, buf, 0, '|', sizeof key);
+                                       extract_token(value, buf, 1, '|', sizeof value);
+                                       store_preference(key, value);
                                }
                        }
                }
@@ -62,7 +87,7 @@ void load_preferences(void) {
 
 /*
  * Goto the user's configuration room, creating it if necessary.
- * Returns 0 on success or nonzero upon failure.
+ * return 0 on success or nonzero upon failure.
  */
 int goto_config_room(void) {
        char buf[SIZ];
@@ -79,10 +104,13 @@ int goto_config_room(void) {
        return(0);
 }
 
-
+/*
+ * save the modifications
+ */
 void save_preferences(void) {
        char buf[SIZ];
        long msgnum = 0L;
+       struct wcpref *ptr;
 
        if (goto_config_room() != 0) return;    /* oh well. */
        serv_puts("MSGS ALL|0|1");
@@ -103,7 +131,9 @@ void save_preferences(void) {
        serv_printf("ENT0 1||0|1|__ WebCit Preferences __|");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '4') {
-               serv_puts(WC->preferences);
+               for (ptr = WC->first_pref; ptr != NULL; ptr = ptr->next) {
+                       serv_printf("%s|%s", ptr->pref_key, ptr->pref_value);
+               }
                serv_puts("");
                serv_puts("000");
        }
@@ -113,93 +143,77 @@ void save_preferences(void) {
        serv_getln(buf, sizeof buf);
 }
 
+/*
+ * query the actual setting of key in the citadel database
+ * key config  key to query
+ * value       value to the key to get
+ * value_len   length of the value string
+ */
 void get_preference(char *key, char *value, size_t value_len) {
-       int num_prefs;
-       int i;
-       char buf[SIZ];
-       char thiskey[SIZ];
+       struct wcpref *ptr;
 
        strcpy(value, "");
 
-       num_prefs = num_tokens(WC->preferences, '\n');
-       for (i=0; i<num_prefs; ++i) {
-               extract_token(buf, WC->preferences, i, '\n', sizeof buf);
-               extract_token(thiskey, buf, 0, '|', sizeof thiskey);
-               if (!strcasecmp(thiskey, key)) {
-                       extract_token(value, buf, 1, '|', value_len);
+       for (ptr = WC->first_pref;  ptr != NULL; ptr = ptr->next) {
+               if (!strcasecmp(ptr->pref_key, key)) {
+                       safestrncpy(value, ptr->pref_value, value_len);
+                       return;
                }
        }
 }
 
+/*
+ *Write a key into the webcit preferences database for this user
+ *
+ * key         key whichs value is to be modified
+ * value               value to set
+ * save_to_server      1 = flush all data to the server, 0 = cache it for now
+ */
 void set_preference(char *key, char *value, int save_to_server) {
-       int num_prefs;
-       int i;
-       char buf[SIZ];
-       char thiskey[SIZ];
-       char *newprefs = NULL;
-
-       num_prefs = num_tokens(WC->preferences, '\n');
-       for (i=0; i<num_prefs; ++i) {
-               extract_token(buf, WC->preferences, i, '\n', sizeof buf);
-               if (num_tokens(buf, '|') == 2) {
-                       extract_token(thiskey, buf, 0, '|', sizeof thiskey);
-                       if (strcasecmp(thiskey, key)) {
-                               if (newprefs == NULL) newprefs = strdup("");
-                               newprefs = realloc(newprefs,
-                                       strlen(newprefs) + SIZ );
-                               strcat(newprefs, buf);
-                               strcat(newprefs, "\n");
-                       }
-               }
-       }
-
-
-       if (newprefs == NULL) newprefs = strdup("");
-       newprefs = realloc(newprefs, strlen(newprefs) + SIZ);
-       sprintf(&newprefs[strlen(newprefs)], "%s|%s\n", key, value);
-
-       free(WC->preferences);
-       WC->preferences = newprefs;
 
+       store_preference(key, value);
        if (save_to_server) save_preferences();
 }
 
 
 
 
-/* 
+/*
  * display form for changing your preferences and settings
  */
 void display_preferences(void)
 {
-       output_headers(1, 1, 2, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
+       char ebuf[300];
        char buf[256];
+       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\">");
+        wprintf(_("Preferences and settings"));
+        wprintf("</div>");
+
+        wprintf("<div class=\"boxcontent\">");
 
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<IMG SRC=\"/static/advanpage2_48x.gif\" ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;");
-       wprintf(_("Preferences and settings"));
-       wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
-       offer_start_page();
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "<div id=\"content\">\n");
-
-       wprintf("<div id=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
-
-       /* begin form */
-       wprintf("<center>\n"
-               "<form name=\"prefform\" action=\"set_preferences\" "
-               "method=\"post\">\n"
-               "<table border=0 cellspacing=5 cellpadding=5>\n");
-
-       /*
+       /** begin form */
+       wprintf("<form name=\"prefform\" action=\"set_preferences\" "
+               "method=\"post\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+
+       /** begin table */
+        wprintf("<table class=\"altern\">\n");
+
+       /**
         * Room list view
         */
        get_preference("roomlistview", buf, sizeof buf);
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Room list view"));
        wprintf("</td><td>");
 
@@ -207,96 +221,240 @@ void display_preferences(void)
        if (!strcasecmp(buf, "folders")) wprintf(" checked");
        wprintf(">");
        wprintf(_("Tree (folders) view"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp;&nbsp;&nbsp;");
 
        wprintf("<input type=\"radio\" name=\"roomlistview\" VALUE=\"rooms\"");
        if (!strcasecmp(buf, "rooms")) wprintf(" checked");
        wprintf(">");
        wprintf(_("Table (rooms) view"));
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
-       /*
-        * Calendar hour format
+       /**
+        * Time hour format
         */
-       get_preference("calhourformat", buf, sizeof buf);
-       if (buf[0] == 0) strcpy(buf, "12");
-       wprintf("<tr><td>");
-       wprintf(_("Calendar hour format"));
+
+       wprintf("<tr class=\"odd\"><td>");
+       wprintf(_("Time format"));
        wprintf("</td><td>");
 
        wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"12\"");
-       if (!strcasecmp(buf, "12")) wprintf(" checked");
+       if (time_format == WC_TIMEFORMAT_AMPM) 
+               wprintf(" checked");
        wprintf(">");
        wprintf(_("12 hour (am/pm)"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp;&nbsp;&nbsp;");
 
        wprintf("<input type=\"radio\" name=\"calhourformat\" VALUE=\"24\"");
-       if (!strcasecmp(buf, "24")) wprintf(" checked");
+       if (time_format == WC_TIMEFORMAT_24)
+               wprintf(" checked");
        wprintf(">");
        wprintf(_("24 hour"));
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
+
+       wprintf("</td></tr>\n");
+
+       /**
+        * Calendar day view -- day start time
+        */
+       get_preference("daystart", buf, sizeof buf);
+       if (buf[0] == 0) strcpy(buf, "8");
+       wprintf("<tr class=\"even\"><td>");
+       wprintf(_("Calendar day view begins at:"));
+       wprintf("</td><td>");
+
+       wprintf("<select name=\"daystart\" size=\"1\">\n");
+       for (i=0; i<=23; ++i) {
+
+               if (time_format == WC_TIMEFORMAT_24) {
+                       wprintf("<option %s value=\"%d\">%d:00</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
+                               i, i
+                       );
+               }
+               else {
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
+                               i, hourname[i]
+                       );
+               }
 
+       }
+       wprintf("</select>\n");
        wprintf("</td></tr>\n");
 
-       /*
-        * Calendar hour format
+       /**
+        * Calendar day view -- day end time
+        */
+       get_preference("dayend", buf, sizeof buf);
+       if (buf[0] == 0) strcpy(buf, "17");
+       wprintf("<tr class=\"odd\"><td>");
+       wprintf(_("Calendar day view ends at:"));
+       wprintf("</td><td>");
+
+       wprintf("<select name=\"dayend\" size=\"1\">\n");
+       for (i=0; i<=23; ++i) {
+
+               if (time_format == WC_TIMEFORMAT_24) {
+                       wprintf("<option %s value=\"%d\">%d:00</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
+                               i, i
+                       );
+               }
+               else {
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
+                               i, hourname[i]
+                       );
+               }
+
+       }
+       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><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Attach signature to email messages?"));
        wprintf("</td><td>");
 
-       wprintf("<input type=\"radio\" name=\"use_sig\" VALUE=\"no\"");
+       wprintf("       <script type=\"text/javascript\">                                       "
+               "       function show_or_hide_sigbox() {                                        "
+               "               if ( $F('yes_sig') ) {                                          "
+               "                       $('signature_box').style.display = 'inline';            "
+               "               }                                                               "
+               "               else {                                                          "
+               "                       $('signature_box').style.display = 'none';              "
+               "               }                                                               "
+               "       }                                                                       "
+               "       </script>                                                               "
+       );
+
+       wprintf("<input type=\"radio\" id=\"no_sig\" name=\"use_sig\" VALUE=\"no\"");
        if (!strcasecmp(buf, "no")) wprintf(" checked");
-       wprintf(">");
+       wprintf(" onChange=\"show_or_hide_sigbox();\" >");
        wprintf(_("No signature"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp,&nbsp;&nbsp;\n");
 
-       wprintf("<input type=\"radio\" name=\"use_sig\" VALUE=\"yes\"");
+       wprintf("<input type=\"radio\" id=\"yes_sig\" name=\"use_sig\" VALUE=\"yes\"");
        if (!strcasecmp(buf, "yes")) wprintf(" checked");
-       wprintf(">");
+       wprintf(" onChange=\"show_or_hide_sigbox();\" >");
        wprintf(_("Use this signature:"));
        wprintf("<div id=\"signature_box\">"
                "<br><textarea name=\"signature\" cols=\"40\" rows=\"5\">"
        );
-       get_preference("signature", buf, sizeof buf);
-       msgescputs(buf);
+       get_preference("signature", ebuf, sizeof ebuf);
+       euid_unescapize(buf, ebuf);
+       escputs(buf);
        wprintf("</textarea>"
                "</div>"
        );
 
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
+       wprintf("       <script type=\"text/javascript\">       "
+               "       show_or_hide_sigbox();                  "
+               "       </script>                               "
+       );
 
+       /** 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=\"even\"><td>");
+       wprintf(_("Default character set for email headers:"));
+       wprintf("</td><td>");
+       wprintf("<input type=\"text\" NAME=\"default_header_charset\" MAXLENGTH=\"32\" VALUE=\"");
+       escputs(buf);
+       wprintf("\">");
+       wprintf("</td></tr>");
+
+       /**
+        * Show empty floors?
+        */
+
+       get_preference("emptyfloors", buf, sizeof buf);
+       if (buf[0] == 0) strcpy(buf, "no");
+       wprintf("<tr class=\"odd\"><td>");
+       wprintf(_("Show empty floors"));
+       wprintf("</td><td>");
+
+       wprintf("<input type=\"radio\" name=\"emptyfloors\" VALUE=\"yes\"");
+       if (!strcasecmp(buf, "yes")) wprintf(" checked");
+       wprintf(">");
+       wprintf(_("Yes"));
+       wprintf("</input>&nbsp;&nbsp;&nbsp;");
+
+       wprintf("<input type=\"radio\" name=\"emptyfloors\" VALUE=\"no\"");
+       if (!strcasecmp(buf, "no")) wprintf(" checked");
+       wprintf(">");
+       wprintf(_("No"));
+       wprintf("</input>\n");
 
-       wprintf("</table>\n"
-               "<input type=\"submit\" name=\"change_button\" value=\"%s\">"
+       wprintf("</td></tr>\n");
+
+       /** end table */
+       wprintf("</table>\n");
+
+       /** submit buttons */
+       wprintf("<div class=\"buttons\"> ");
+       wprintf("<input type=\"submit\" name=\"change_button\" value=\"%s\">"
                "&nbsp;"
                "<INPUT type=\"submit\" name=\"cancel_button\" value=\"%s\">\n",
                _("Change"),
                _("Cancel")
        );
+       wprintf("</div>\n");
 
-       wprintf("</form></center>\n");
-
-       /* end form */
-
-
-       wprintf("</td></tr></table></div>\n");
+       /** end form */
+       wprintf("</form>\n");
+       wprintf("</div>\n");
        wDumpContent(1);
 }
 
-/*
- * Commit new preferences and settings
+/**
+ * \brief Commit new preferences and settings
  */
 void set_preferences(void)
 {
-       if (strlen(bstr("change_button")) == 0) {
+       char *fmt;
+       char ebuf[300];
+       int *time_format_cache;
+       
+       time_format_cache = &(WC->time_format_cache);
+
+       if (IsEmptyStr(bstr("change_button"))) {
                safestrncpy(WC->ImportantMessage, 
                        _("Cancelled.  No settings were changed."),
                        sizeof WC->ImportantMessage);
@@ -304,13 +462,30 @@ void set_preferences(void)
                return;
        }
 
-       /* Set the last argument to 1 only for the final setting, so
+       /**
+        * Set the last argument to 1 only for the final setting, so
         * 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("signature", bstr("signature"), 1);
+       set_preference("daystart", bstr("daystart"), 0);
+       set_preference("dayend", bstr("dayend"), 0);
+       set_preference("default_header_charset", bstr("default_header_charset"), 0);
+       set_preference("emptyfloors", bstr("emptyfloors"), 0);
+
+       euid_escapize(ebuf, bstr("signature"));
+       set_preference("signature", ebuf, 1);
 
        display_main_menu();
 }
+
+
+/*@}*/