* create function to parse the output of goto into our folder structure

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index c46d0ad1ca15f343ec5b2d75f716f5ed3b44dc71..aeca0028a1ee73567dd0e473e72d48f909d9a555 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -197,14 +197,18 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
  */
 void load_preferences(void) 
 {
+       folder Room;
        wcsession *WCC = WC;
        int Done = 0;
        StrBuf *ReadBuf;
        long msgnum = 0L;
        
+       memset(&Room, 0, sizeof(folder));
        ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
-       if (goto_config_room(ReadBuf) != 0) {
+       if (goto_config_room(ReadBuf, &Room) != 0) {
                FreeStrBuf(&ReadBuf);
+               FlushFolder(&Room);
+
                return; /* oh well. */
        }
 
@@ -239,19 +243,20 @@ void load_preferences(void)
        }
 
        /* Go back to the room we're supposed to be in */
-       if (StrLength(WCC->wc_roomname) > 0) {
-               serv_printf("GOTO %s", ChrPtr(WCC->wc_roomname));
+       if (StrLength(WCC->CurRoom.name) > 0) {
+               serv_printf("GOTO %s", ChrPtr(WCC->CurRoom.name));
                StrBuf_ServGetln(ReadBuf);
                GetServerStatus(ReadBuf, NULL);
        }
        FreeStrBuf(&ReadBuf);
+       FlushFolder(&Room);
 }
 
 /*
  * Goto the user's configuration room, creating it if necessary.
  * returns 0 on success or nonzero upon failure.
  */
-int goto_config_room(StrBuf *Buf) 
+int goto_config_room(StrBuf *Buf, folder *Room) 
 {
        serv_printf("GOTO %s", USERCONFIGROOM);
        StrBuf_ServGetln(Buf);
@@ -266,6 +271,7 @@ int goto_config_room(StrBuf *Buf)
                        return(1);
                }
        }
+       ParseGoto(Room, Buf);
        return(0);
 }
 
@@ -330,16 +336,23 @@ void WritePrefsToServer(HashList *Hash)
  */
 void save_preferences(void) 
 {
+       folder Room;
        wcsession *WCC = WC;
        int Done = 0;
        StrBuf *ReadBuf;
        long msgnum = 0L;
        
        ReadBuf = NewStrBuf();
-       if (goto_config_room(ReadBuf) != 0) {
+       memset(&Room, 0, sizeof(folder));
+       if (goto_config_room(ReadBuf, &Room) != 0) {
                FreeStrBuf(&ReadBuf);
+               FlushFolder(&Room);
+
                return; /* oh well. */
        }
+//void do_change_view(int newview) {
+
+
        serv_puts("MSGS ALL|0|1");
        StrBuf_ServGetln(ReadBuf);
        if (GetServerStatus(ReadBuf, NULL) == 8) {
@@ -372,12 +385,13 @@ void save_preferences(void)
        }
 
        /** Go back to the room we're supposed to be in */
-       if (StrLength(WCC->wc_roomname) > 0) {
-               serv_printf("GOTO %s", ChrPtr(WCC->wc_roomname));
+       if (StrLength(WCC->CurRoom.name) > 0) {
+               serv_printf("GOTO %s", ChrPtr(WCC->CurRoom.name));
                StrBuf_ServGetln(ReadBuf);
                GetServerStatus(ReadBuf, NULL);
        }
        FreeStrBuf(&ReadBuf);
+       FlushFolder(&Room);
 }
 
 /**
@@ -581,7 +595,7 @@ int get_room_prefs_backend(const char *key, size_t keylen,
        int Ret;
 
        pref_name = NewStrBufPlain (HKEY("ROOM:"));
-       StrBufAppendBuf(pref_name, WC->wc_roomname, 0);
+       StrBufAppendBuf(pref_name, WC->CurRoom.name, 0);
        StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
        StrBufAppendBufPlain(pref_name, key, keylen, 0);
        Ret = get_pref_backend(SKEY(pref_name), Pref);
@@ -624,6 +638,28 @@ void set_X_PREFS(const char *key, size_t keylen, const char *xkey, size_t xkeyle
 }
 
 
+long get_ROOM_PREFS_LONG(const char *key, size_t keylen, long *value, long Default)
+{
+       Preference *Pref;
+       int Ret;
+
+       Ret = get_room_prefs_backend(key, keylen, &Pref);
+
+       if (Ret == 0) {
+               *value = Default;
+               return 0;
+       }
+
+       if (Pref->decoded)
+               *value = Pref->lval;
+       else {
+               *value = Pref->lval = atol(ChrPtr(Pref->Val));
+               Pref->decoded = 1;
+       }
+       return Ret;
+}
+
+
 StrBuf *get_ROOM_PREFS(const char *key, size_t keylen)
 {
        Preference *Pref;
@@ -643,7 +679,7 @@ void set_ROOM_PREFS(const char *key, size_t keylen, StrBuf *value, int save_to_s
        StrBuf *pref_name;
        
        pref_name = NewStrBufPlain (HKEY("ROOM:"));
-       StrBufAppendBuf(pref_name, WC->wc_roomname, 0);
+       StrBufAppendBuf(pref_name, WC->CurRoom.name, 0);
        StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
        StrBufAppendBufPlain(pref_name, key, keylen, 0);
        set_preference_backend(SKEY(pref_name), 0, value, PRF_STRING, save_to_server, NULL);
@@ -783,6 +819,16 @@ void tmplput_CFG_Descr(StrBuf *Target, WCTemplputParams *TP)
        if (SettingStr != NULL) 
                StrBufAppendBufPlain(Target, SettingStr, -1, 0);
 }
+void tmplput_CFG_RoomValueLong(StrBuf *Target, WCTemplputParams *TP)
+{
+       long lvalue;
+       long defval = 0;
+
+       if (HAVE_PARAM(1))
+               defval = GetTemplateTokenNumber(Target, TP, 1, 0);
+       get_ROOM_PREFS_LONG(TKEY(0), &lvalue, defval);
+       StrBufAppendPrintf(Target, "%ld", lvalue);
+}
 void tmplput_CFG_RoomValue(StrBuf *Target, WCTemplputParams *TP)
 {
        StrBuf *pref = get_ROOM_PREFS(TKEY(0));
@@ -805,7 +851,7 @@ int ConditionalPreference(StrBuf *Target, WCTemplputParams *TP)
        if (!get_PREFERENCE(TKEY(2), &Pref)) 
                return 0;
        
-       if (TP->Tokens->nParameters == 3) {
+       if (!HAVE_PARAM(3)) {
                return 1;
        }
        else if (TP->Tokens->Params[3]->Type == TYPE_STR)
@@ -912,11 +958,11 @@ void DeleteGVSNHash(HashList **KillMe)
  */
 void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
 {
-       wprintf("<a href=\"change_start_page?startpage=");
+       wc_printf("<a href=\"change_start_page?startpage=");
        urlescputs(ChrPtr(WC->Hdr->this_page));
-       wprintf("\">");
-       wprintf(_("Make this my start page"));
-       wprintf("</a>");
+       wc_printf("\">");
+       wc_printf(_("Make this my start page"));
+       wc_printf("</a>");
 }
 
 
@@ -971,15 +1017,17 @@ void
 InitModule_PREFERENCES
 (void)
 {
-       WebcitAddUrlHandler(HKEY("set_preferences"), set_preferences, 0);
-       WebcitAddUrlHandler(HKEY("change_start_page"), change_start_page, 0);
+       WebcitAddUrlHandler(HKEY("set_preferences"), "", 0, set_preferences, 0);
+       WebcitAddUrlHandler(HKEY("change_start_page"), "", 0, change_start_page, 0);
 
        RegisterPreference("startpage", _("Prefered startpage"), PRF_STRING, LoadStartpage);
 
-       RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, CTX_NONE);
-       RegisterNamespace("PREF:ROOM:VALUE", 1, 2, tmplput_CFG_RoomValue,  CTX_NONE);
-       RegisterNamespace("PREF:VALUE", 1, 2, tmplput_CFG_Value, CTX_NONE);
-       RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, CTX_NONE);
+       RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, NULL, CTX_NONE);
+       RegisterNamespace("PREF:ROOM:VALUE", 1, 2, tmplput_CFG_RoomValue,  NULL, CTX_NONE);
+       RegisterNamespace("PREF:ROOM:VALUE:INT", 1, 2, tmplput_CFG_RoomValueLong,  NULL, CTX_NONE);
+       RegisterNamespace("PREF:VALUE", 1, 2, tmplput_CFG_Value, NULL, CTX_NONE);
+       
+       RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, NULL, CTX_NONE);
 
        RegisterConditional(HKEY("COND:PREF"), 4, ConditionalPreference, CTX_NONE);
        RegisterConditional(HKEY("COND:PREF:SET"), 4, ConditionalHasPreference, CTX_NONE);