* ParsePref() was returning if it encountered a blank line in the preferences data...

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 3ee036cba47f78712059b2a23de752ad7a4ee561..ac4fb3c483b4099e547591fe2f00c62059aa6954 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -151,8 +151,8 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
        Preference *Data = NULL;
        Preference *LastData = NULL;
                                
-       while (!Done && StrBuf_ServGetln(ReadBuf))
-       {
+       while (!Done) {
+               StrBuf_ServGetln(ReadBuf);
                if ( (StrLength(ReadBuf)==3) && 
                     !strcmp(ChrPtr(ReadBuf), "000")) {
                        Done = 1;
@@ -160,8 +160,8 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
                }
 
                if ((ChrPtr(ReadBuf)[0] == ' ') &&
-                   (Data != NULL)) {
-                       StrBufAppendBuf(Data->Val, ReadBuf, 1);
+                   (LastData != NULL)) {
+                       StrBufAppendBuf(LastData->Val, ReadBuf, 1);
                }
                else {
                        LastData = Data = malloc(sizeof(Preference));
@@ -185,6 +185,7 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
                                DestroyPreference(Data);
                                LastData = NULL;
                        }
+                       Data = NULL;
                }
        }
        GetPrefTypes(*List);
@@ -201,7 +202,7 @@ void load_preferences(void)
        StrBuf *ReadBuf;
        long msgnum = 0L;
        
-       ReadBuf = NewStrBuf();
+       ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
        if (goto_config_room(ReadBuf) != 0) {
                FreeStrBuf(&ReadBuf);
                return; /* oh well. */
@@ -293,7 +294,7 @@ void WritePrefsToServer(HashList *Hash)
                        int n = 0;
                        size_t offset, nchars;
                        if (SubBuf == NULL)
-                               SubBuf = NewStrBuf();
+                               SubBuf = NewStrBufPlain(NULL, SIZ);
                        nchars = 1;
                        offset = 0;
                        while (nchars > 0) {
@@ -795,12 +796,6 @@ int ConditionalHasRoomPreference(StrBuf *Target, WCTemplputParams *TP)
   
        return 0;
 }
-void CfgZoneTempl(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
-       StrBuf *Zone = (StrBuf*) CTX;
-
-       SVPutBuf("ZONENAME", Zone, 1);
-}
 
 int ConditionalPreference(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -917,7 +912,7 @@ void DeleteGVSNHash(HashList **KillMe)
 void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
 {
        wprintf("<a href=\"change_start_page?startpage=");
-       urlescputs(ChrPtr(WC->this_page));
+       urlescputs(ChrPtr(WC->Hdr->this_page));
        wprintf("\">");
        wprintf(_("Make this my start page"));
        wprintf("</a>");
@@ -926,7 +921,7 @@ void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
        urlescputs(ChrPtr(WC->wc_roomname));
        wprintf("\" title=\"RSS 2.0 feed for ");
        escputs(ChrPtr(WC->wc_roomname));
-       wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"static/xml_button.gif\"/></a>\n");
+       wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"static/xml_button.gif\" width=\"36\" height=\"14\" /></a>\n");
 #endif
 }
 
@@ -963,6 +958,21 @@ void change_start_page(void)
 }
 
 
+void LoadStartpage(StrBuf *URL, long lvalue)
+{
+       const char *pch;
+       pch = strchr(ChrPtr(URL), '?');
+       if (pch == NULL) {
+               /* purge the sins of the past... */
+               pch = strchr(ChrPtr(URL), '&');
+               if (pch != NULL) {
+                       StrBufPeek(URL, pch, -1, '?');
+                       WC->SavePrefsToServer = 1;
+               }
+       }
+}
+
+
 void 
 InitModule_PREFERENCES
 (void)
@@ -970,12 +980,12 @@ InitModule_PREFERENCES
        WebcitAddUrlHandler(HKEY("set_preferences"), set_preferences, 0);
        WebcitAddUrlHandler(HKEY("change_start_page"), 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);
-       RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, CfgZoneTempl, NULL, CTX_PREF, CTX_NONE, IT_NOFLAG);
 
        RegisterConditional(HKEY("COND:PREF"), 4, ConditionalPreference, CTX_NONE);
        RegisterConditional(HKEY("COND:PREF:SET"), 4, ConditionalHasPreference, CTX_NONE);
@@ -987,4 +997,48 @@ InitModule_PREFERENCES
                         GetGVSNHash, NULL, DeleteGVSNHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 
 }
+
+
+void 
+ServerStartModule_PREFERENCES
+(void)
+{
+       PreferenceHooks = NewHash(1, NULL);
+}
+
+
+
+void 
+ServerShutdownModule_PREFERENCES
+(void)
+{
+       DeleteHash(&PreferenceHooks);
+}
+
+void
+SessionDetachModule__PREFERENCES
+(wcsession *sess)
+{
+       if (sess->SavePrefsToServer) {
+               save_preferences();
+               sess->SavePrefsToServer = 0;
+       }
+}
+
+void
+SessionNewModule_PREFERENCES
+(wcsession *sess)
+{
+       sess->hash_prefs = NewHash(1,NULL);
+}
+
+void 
+SessionDestroyModule_PREFERENCES
+(wcsession *sess)
+{
+       DeleteHash(&sess->hash_prefs);
+}
+
+
+
 /*@}*/