* don't use sv* here

[citadel.git] / webcit / inetconf.c

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 40966f24eb6284183f5f0c0bfe048d5c3b320123..4adb07e09cdf685feac1b0849ba40eeb7b5b0444 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -12,6 +12,7 @@ typedef enum _e_cfg {
        ic_localhost,
        ic_directory,
        ic_smarthost,
+       ic_fallback,
        ic_rbl,
        ic_spamass,
        ic_masq,
@@ -31,6 +32,7 @@ ConstStrBuf CfgNames[] = {
        { HKEY("localhost") },
        { HKEY("directory") },
        { HKEY("smarthost") },
+       { HKEY("fallbackhost") },
        { HKEY("rbl") },
        { HKEY("spamassassin") },
        { HKEY("masqdomain") },
@@ -128,6 +130,7 @@ void new_save_inetconf(void) {
                FlushStrBuf(Str);       
        }
        else if (!strcasecmp(bstr("oper"), "add")) {
+               StrBuf *name;
                eName = sbstr("ename");
                if (eName == NULL) {
                        StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
@@ -137,8 +140,9 @@ void new_save_inetconf(void) {
 
                nUsed = GetCount(Hash);
                nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
-       
-               Put(Hash, nnn, nUsed, NewStrBufDup(eName), HFreeStrBuf); 
+               name = NewStrBufDup(eName);
+               StrBufTrim(name);
+               Put(Hash, nnn, nUsed, name, HFreeStrBuf); 
                StrBufPrintf(WCC->ImportantMsg, "%s %s", 
                             /*<domain> added status message*/ _("added."), 
                             ChrPtr(eName));
@@ -179,11 +183,6 @@ void new_save_inetconf(void) {
        url_do_template();
 }
 
-void InetCfgSubst(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
-       SVPutBuf("SERVCFG:INET:HOSTNAME", CTX, 1);
-}
-
 void DeleteInetConfHash(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -202,7 +201,7 @@ HashList *GetInetConfHash(StrBuf *Target, WCTemplputParams *TP)
        if (WCC->InetCfg == NULL)
                load_inetconf();
        GetHash(WCC->InetCfg, TKEY(5), &vHash);
-       svprintf(HKEY("SERVCFG:INET:TYPE"), WCS_STRING, TP->Tokens->Params[5]->Start);
+       PutBstr(HKEY("__SERVCFG:INET:TYPE"), NewStrBufPlain(TKEY(5)));
        return vHash;
 }
 
@@ -210,7 +209,7 @@ void
 InitModule_INETCONF
 (void)
 {
-       WebcitAddUrlHandler(HKEY("save_inetconf"), new_save_inetconf, 0);
-       RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, InetCfgSubst, NULL, CTX_INETCFG, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("SERVCFG:FLUSHINETCFG",0, 0, DeleteInetConfHash, CTX_NONE);
+       WebcitAddUrlHandler(HKEY("save_inetconf"), "", 0, new_save_inetconf, 0);
+       RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+       RegisterNamespace("SERVCFG:FLUSHINETCFG",0, 0, DeleteInetConfHash, NULL, CTX_NONE);
 }