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

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index fae98f03a8bfeb0fd2cf2e4b9bc00a3986389ab8..c134355aefaead9bcffe5e8067c4c0ad0ab738bc 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -16,6 +16,7 @@ typedef struct _PrefDef {
        StrBuf *Setting;
        const char *PrefStr;
        PrefEvalFunc OnLoad;
+       StrBuf *OnLoadName;
 } PrefDef;
 
 typedef struct _Preference {
@@ -32,6 +33,7 @@ void DestroyPrefDef(void *vPrefDef)
 {
        PrefDef *Prefdef = (PrefDef*) vPrefDef;
        FreeStrBuf(&Prefdef->Setting);
+       FreeStrBuf(&Prefdef->OnLoadName);
        free(Prefdef);
 }
 
@@ -44,16 +46,22 @@ void DestroyPreference(void *vPref)
        free(Pref);
 
 }
-void RegisterPreference(const char *Setting, long SettingLen, 
-                       const char *PrefStr, 
-                       long Type, 
-                       PrefEvalFunc OnLoad)
+void _RegisterPreference(const char *Setting, long SettingLen, 
+                        const char *PrefStr, 
+                        long Type, 
+                        PrefEvalFunc OnLoad, 
+                        const char *OnLoadName)
 {
        PrefDef *Newpref = (PrefDef*) malloc(sizeof(PrefDef));
        Newpref->Setting = NewStrBufPlain(Setting, SettingLen);
        Newpref->PrefStr = PrefStr;
        Newpref->Type = Type;
        Newpref->OnLoad = OnLoad;
+       if (Newpref->OnLoad != NULL) {
+               Newpref->OnLoadName = NewStrBufPlain(OnLoadName, -1);
+       }
+       else
+               Newpref->OnLoadName = NULL;
        Put(PreferenceHooks, Setting, SettingLen, Newpref, DestroyPrefDef);
 }
 
@@ -86,31 +94,62 @@ void GetPrefTypes(HashList *List)
        const char *Key;
        void *vSetting;
        void *vPrefDef;
-       Preference *Setting;
+       Preference *Pref;
        PrefDef *PrefType;
 
        It = GetNewHashPos(List, 0);
        while (GetNextHashPos(List, It, &len, &Key, &vSetting)) 
        {
-               Setting = (Preference*) vSetting;
-               if (GetHash(PreferenceHooks, SKEY(Setting->Key), &vPrefDef) && 
+               Pref = (Preference*) vSetting;
+               if (GetHash(PreferenceHooks, SKEY(Pref->Key), &vPrefDef) && 
                    (vPrefDef != NULL)) 
                {
                        PrefType = (PrefDef*) vPrefDef;
-                       Setting->Type = PrefType;
-                       if (PrefType->OnLoad != NULL)
-                               PrefType->OnLoad(Setting->Val, Setting->lval);
+                       Pref->Type = PrefType;
+
+                       lprintf(1, "Loading [%s]with type [%ld] [\"%s\"]\n",
+                               ChrPtr(Pref->Key),
+                               Pref->Type->Type,
+                               ChrPtr(Pref->Val));
+
+                       switch (Pref->Type->Type)
+                       {
+
+                       case PRF_STRING:
+                               break;
+                       case PRF_INT:
+                               Pref->lval = StrTol(Pref->Val);
+                               Pref->decoded = 1;
+                               break;
+                       case PRF_QP_STRING:
+                               Pref->DeQPed = NewStrBufPlain(NULL, StrLength(Pref->Val));
+                               StrBufEUid_unescapize(Pref->DeQPed, Pref->Val);
+                               Pref->decoded = 1;
+                               break;
+                       case PRF_YESNO:
+                               Pref->lval = strcmp(ChrPtr(Pref->Val), "yes") == 0;
+                               Pref->decoded = 1;
+                               break;
+                       }
+
+                       if (PrefType->OnLoad != NULL){
+
+                               lprintf(1, "Loading with: -> %s(\"%s\", %ld)\n",
+                                       ChrPtr(PrefType->OnLoadName),
+                                       ChrPtr(Pref->Val),
+                                       Pref->lval);
+                               PrefType->OnLoad(Pref->Val, Pref->lval);
+                       }
                }
        }
+       DeleteHashPos(&It);
 }
 
 void ParsePref(HashList **List, StrBuf *ReadBuf)
 {
-       StrBuf *Key;
        Preference *Data = NULL;
        Preference *LastData = NULL;
                                
-       Key = NewStrBuf();
        while (StrBuf_ServGetln(ReadBuf), 
               strcmp(ChrPtr(ReadBuf), "000")) 
        {
@@ -121,6 +160,8 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
                else {
                        LastData = Data = malloc(sizeof(Preference));
                        memset(Data, 0, sizeof(Preference));
+                       Data->Key = NewStrBuf();
+                       Data->Val = NewStrBuf();
                        StrBufExtract_token(Data->Key, ReadBuf, 0, '|');
                        StrBufExtract_token(Data->Val, ReadBuf, 1, '|');
                        if (!IsEmptyStr(ChrPtr(Data->Key)))
@@ -153,8 +194,7 @@ void load_preferences(void)
        char buf[SIZ];
        long msgnum = 0L;
        
-       if (!goto_config_room())
-               return;
+       if (goto_config_room() != 0) return;    /* oh well. */
 
        ReadBuf = NewStrBuf();
        serv_puts("MSGS ALL|0|1");
@@ -631,6 +671,7 @@ void GetPreferences(HashList *Setting)
                }
        }
        WCC->hash_prefs = Tmp;
+       DeleteHashPos(&It);
 }
 
 
@@ -837,7 +878,7 @@ void DeleteGVSNHash(HashList **KillMe)
 void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
 {
        wprintf("<a href=\"change_start_page?startpage=");
-       urlescputs(WC->this_page);
+       urlescputs(ChrPtr(WC->this_page));
        wprintf("\">");
        wprintf(_("Make this my start page"));
        wprintf("</a>");