]> 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 a21468c63f1816927b89a9ce32d1e1b7b75910fb..8991c0c13f06e98d53f2f3e71b2a81590f2d9d36 100644 (file)
@@ -1,22 +1,52 @@
 /*
  * $Id$
- */
-/**
- * \defgroup ManagePrefs Manage user preferences with a little help from the Citadel server.
- * \ingroup CitadelConfig
+ *
+ * Manage user preferences with a little help from the Citadel server.
  *
  */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
 
 
-/**
- * \brief display preferences dialog
+/* 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);
@@ -42,32 +72,22 @@ 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);
                                }
                        }
                }
        }
 
-       /** Go back to the room we're supposed to be in */
+       /* Go back to the room we're supposed to be in */
        serv_printf("GOTO %s", WC->wc_roomname);
        serv_getln(buf, sizeof buf);
 }
 
-/**
- * \brief Goto the user's configuration room, creating it if necessary.
- * \return 0 on success or nonzero upon failure.
+/*
+ * Goto the user's configuration room, creating it if necessary.
+ * return 0 on success or nonzero upon failure.
  */
 int goto_config_room(void) {
        char buf[SIZ];
@@ -84,12 +104,13 @@ int goto_config_room(void) {
        return(0);
 }
 
-/**
- * \brief save the modifications
+/*
+ * 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");
@@ -110,119 +131,89 @@ 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");
        }
 
-       /** Go back to the room we're supposed to be in */
+       /* Go back to the room we're supposed to be in */
        serv_printf("GOTO %s", WC->wc_roomname);
        serv_getln(buf, sizeof buf);
 }
 
-/**
- * \brief query the actual setting of key in the citadel database
- * \param key config key to query
- * \param value value to the key to get
- * \param value_len length of the value string
+/*
+ * 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;
                }
        }
 }
 
-/**
- * \brief      Write a key into the webcit preferences database for this user
+/*
+ *Write a key into the webcit preferences database for this user
  *
- * \params     key             key whichs value is to be modified
- * \param      value           value to set
- * \param      save_to_server  1 = flush all data to the server, 0 = cache it for now
+ * 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();
 }
 
 
 
 
-/*
- * \brief display form for changing your preferences and settings
+/*
+ * 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];
-       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 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 class=\"box\">\n");
+        wprintf("<div class=\"boxlabel\">");
+        wprintf(_("Preferences and settings"));
+        wprintf("</div>");
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+        wprintf("<div class=\"boxcontent\">");
 
        /** begin form */
-       wprintf("<center>\n"
-               "<form name=\"prefform\" action=\"set_preferences\" "
-               "method=\"post\">\n"
-               "<table border=0 cellspacing=5 cellpadding=5>\n");
+       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>");
 
@@ -230,36 +221,37 @@ 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", calhourformat, sizeof calhourformat);
-       if (calhourformat[0] == 0) strcpy(calhourformat, "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(calhourformat, "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(calhourformat, "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");
 
@@ -268,28 +260,28 @@ void display_preferences(void)
         */
        get_preference("daystart", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "8");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Calendar day view begins at:"));
        wprintf("</td><td>");
 
-       wprintf("<SELECT NAME=\"daystart\" SIZE=\"1\">\n");
+       wprintf("<select name=\"daystart\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
-               if (!strcasecmp(calhourformat, "24")) {
-                       wprintf("<OPTION %s VALUE=\"%d\">%d:00</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+               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" : ""),
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, hourname[i]
                        );
                }
 
        }
-       wprintf("</SELECT>\n");
+       wprintf("</select>\n");
        wprintf("</td></tr>\n");
 
        /**
@@ -297,28 +289,54 @@ void display_preferences(void)
         */
        get_preference("dayend", buf, sizeof buf);
        if (buf[0] == 0) strcpy(buf, "17");
-       wprintf("<tr><td>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Calendar day view ends at:"));
        wprintf("</td><td>");
 
-       wprintf("<SELECT NAME=\"dayend\" SIZE=\"1\">\n");
+       wprintf("<select name=\"dayend\" size=\"1\">\n");
        for (i=0; i<=23; ++i) {
 
-               if (!strcasecmp(calhourformat, "24")) {
-                       wprintf("<OPTION %s VALUE=\"%d\">%d:00</OPTION>\n",
-                               ((atoi(buf) == i) ? "SELECTED" : ""),
+               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" : ""),
+                       wprintf("<option %s value=\"%d\">%s</option>\n",
+                               ((atoi(buf) == i) ? "selected" : ""),
                                i, hourname[i]
                        );
                }
 
        }
-       wprintf("</SELECT>\n");
+       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");
 
        /**
@@ -326,7 +344,7 @@ void display_preferences(void)
         */
        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>");
 
@@ -346,7 +364,7 @@ void display_preferences(void)
        if (!strcasecmp(buf, "no")) wprintf(" checked");
        wprintf(" onChange=\"show_or_hide_sigbox();\" >");
        wprintf(_("No signature"));
-       wprintf("<br></input>\n");
+       wprintf("</input>&nbsp,&nbsp;&nbsp;\n");
 
        wprintf("<input type=\"radio\" id=\"yes_sig\" name=\"use_sig\" VALUE=\"yes\"");
        if (!strcasecmp(buf, "yes")) wprintf(" checked");
@@ -362,7 +380,7 @@ void display_preferences(void)
                "</div>"
        );
 
-       wprintf("<br></input>\n");
+       wprintf("</input>\n");
 
        wprintf("</td></tr>\n");
 
@@ -374,24 +392,54 @@ 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><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=\"%s\">", buf);
+       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("</td></tr>\n");
+
+       /** end table */
+       wprintf("</table>\n");
+
        /** submit buttons */
-       wprintf("</table>\n"
-               "<input type=\"submit\" name=\"change_button\" value=\"%s\">"
+       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");
 
        /** end form */
-       wprintf("</form></center>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</form>\n");
+       wprintf("</div>\n");
        wDumpContent(1);
 }
 
@@ -400,9 +448,13 @@ 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 (strlen(bstr("change_button")) == 0) {
+       if (IsEmptyStr(bstr("change_button"))) {
                safestrncpy(WC->ImportantMessage, 
                        _("Cancelled.  No settings were changed."),
                        sizeof WC->ImportantMessage);
@@ -415,11 +467,19 @@ 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);
        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);