]> code.citadel.org Git - citadel.git/blobdiff - webcit/preferences.c
Removed some spurious trace messages
[citadel.git] / webcit / preferences.c
index c854533387fc9c649a660bde5390a47e47913955..543c97ae367a6867f8846327b7e24d034bdaf288 100644 (file)
@@ -1,24 +1,22 @@
 /*
  * $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
+/*
+ * display preferences dialog
  */
 void load_preferences(void) {
        char buf[SIZ];
        long msgnum = 0L;
-
+       char key[SIZ], value[SIZ];
+       
        serv_printf("GOTO %s", USERCONFIGROOM);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') return;
@@ -42,25 +40,16 @@ 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);
+                                       if (!IsEmptyStr(key))
+                                               Put(WC->hash_prefs, key, strlen(key), strdup(value), free);
                                }
                        }
                }
        }
 
-       /** 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);
 }
@@ -90,7 +79,7 @@ int goto_config_room(void) {
 void save_preferences(void) {
        char buf[SIZ];
        long msgnum = 0L;
-
+       
        if (goto_config_room() != 0) return;    /* oh well. */
        serv_puts("MSGS ALL|0|1");
        serv_getln(buf, sizeof buf);
@@ -110,9 +99,22 @@ 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);
+               long len;
+               HashPos *HashPos;
+               HashList *Hash;
+               char *Value;
+               char *Key;
+               
+               Hash = WC->hash_prefs;
+               PrintHash(Hash);
+               HashPos = GetNewHashPos();
+               while (GetNextHashPos(Hash, HashPos, &len, &Key, (void**)&Value)!=0)
+               {
+                       serv_printf("%s|%s", Key, Value);
+               }
                serv_puts("");
                serv_puts("000");
+               DeleteHashPos(&HashPos);
        }
 
        /** Go back to the room we're supposed to be in */
@@ -127,21 +129,15 @@ void save_preferences(void) {
  * \param 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];
-
+       void *hash_value = NULL;
+       
        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);
-               }
-       }
+       PrintHash(WC->hash_prefs);
+       if (GetHash(WC->hash_prefs, key, strlen(key), &hash_value) == 0)
+               return;
+       
+       if(hash_value)
+               safestrncpy(value, hash_value, value_len);
 }
 
 /**
@@ -152,35 +148,9 @@ void get_preference(char *key, char *value, size_t value_len) {
  * \param      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;
-       size_t newprefs_len = 0;
-
-       newprefs_len = strlen(key) + strlen(value) + 10;
-       if (WC->preferences != NULL) newprefs_len += strlen(WC->preferences);
-       newprefs = malloc(newprefs_len);
-       if (newprefs == NULL) return;
-       strcpy(newprefs, "");
-
-       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)) {
-                               strcat(newprefs, buf);
-                               strcat(newprefs, "\n");
-                       }
-               }
-       }
-
-       sprintf(&newprefs[strlen(newprefs)], "%s|%s\n", key, value);
-       free(WC->preferences);
-       WC->preferences = newprefs;
-
+       
+       Put(WC->hash_prefs, key, strlen(key), strdup(value), free);
+       
        if (save_to_server) save_preferences();
 }
 
@@ -197,6 +167,9 @@ void display_preferences(void)
        char buf[256];
        int i;
        int time_format;
+       time_t tt;
+       struct tm tm;
+       char daylabel[32];
        
        time_format = get_time_format_cached ();
 
@@ -319,12 +292,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>");
 
@@ -372,7 +371,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=\"");
@@ -380,6 +379,30 @@ void display_preferences(void)
        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");
 
@@ -430,10 +453,12 @@ void set_preferences(void)
        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);