final touches on dkim test harness

[citadel.git] / webcit / inetconf.c

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index a19c4fbd70079cd871cbe981a862775f38e2e78c..3b7d82de50a5bf6517c9ac200ab88f1158cc9fe9 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -3,7 +3,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 
 typedef enum _e_cfg {
@@ -19,14 +19,9 @@ typedef enum _e_cfg {
        ic_max
 } ECfg;
 
-typedef struct _ConstStrBuf {
-       const char *name;
-       size_t len;
-} ConstStrBuf;
-
 
   /* These are server config keywords; do not localize! */
-ConstStrBuf CfgNames[] = {
+ConstStr CfgNames[] = {
        { HKEY("localhost") },
        { HKEY("directory") },
        { HKEY("smarthost") },
@@ -55,9 +50,9 @@ void load_inetconf(void)
        
        WCC->InetCfg = NewHash(1, NULL);
 
-       for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStrBuf)); i++) {
+       for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStr)); i++) {
                Hash = NewHash(1, NULL);
-               Put(WCC->InetCfg, CfgNames[i].name, CfgNames[i].len, Hash, HDeleteHash);
+               Put(WCC->InetCfg, CKEY(CfgNames[i]), Hash, HDeleteHash);
        }
 
        serv_printf("CONF GETSYS|application/x-citadel-internet-config");
@@ -66,17 +61,22 @@ void load_inetconf(void)
                
        if (GetServerStatus(Buf, NULL) == 1) {
                CfgToken = NewStrBuf();
-               while ((len = StrBuf_ServGetln(Buf),
-                       strcmp(ChrPtr(Buf), "000"))) {
+               while ((len = StrBuf_ServGetln(Buf), ((len >= 0) && ((len != 3) || strcmp(ChrPtr(Buf), "000")))))
+               {
                        Value = NewStrBuf();
- 
                        StrBufExtract_token(CfgToken, Buf, 1, '|');
+
+                       // VILE SLEAZY HACK: change obsolete "directory" domains to "localhost" domains
+                       if (!strcasecmp(ChrPtr(CfgToken), "directory")) {
+                               FreeStrBuf(&CfgToken);
+                               CfgToken = NewStrBufPlain(HKEY("localhost"));
+                       }
+
                        StrBufExtract_token(Value, Buf, 0, '|');
                        GetHash(WCC->InetCfg, ChrPtr(CfgToken), StrLength(CfgToken), &vHash);
                        Hash = (HashList*) vHash;
                        if (Hash == NULL) {
-                               lprintf(1, "ERROR Loading inet config line: [%s]\n", 
-                                       ChrPtr(Buf));
+                               syslog(LOG_WARNING, "ERROR Loading inet config line: [%s]", ChrPtr(Buf));
                                FreeStrBuf(&Value);
                                continue;
                        }
@@ -109,7 +109,7 @@ void new_save_inetconf(void) {
        GetHash(WCC->InetCfg, ChrPtr(eType), StrLength(eType), &vHash);
        Hash = (HashList*) vHash;
        if (Hash == NULL) {
-               StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
+               AppendImportantMessage(_("Invalid Parameter"), -1);
                url_do_template();
                return;
        }
@@ -118,20 +118,21 @@ void new_save_inetconf(void) {
                eNum = sbstr("ename");
                if (!GetHash(Hash, ChrPtr(eNum), StrLength(eNum), &vStr) ||
                    (vStr == NULL)) {
-                       StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
+                       AppendImportantMessage(_("Invalid Parameter"), -1);
                        url_do_template();
                        return;
                }
 
                Str = (StrBuf*)vStr;
-               StrBufPrintf(WCC->ImportantMsg, _("%s has been deleted."), ChrPtr(Str));
+               AppendImportantMessage(SKEY(Str));
+               AppendImportantMessage(_(" has been deleted."), -1);
                FlushStrBuf(Str);       
        }
        else if (!strcasecmp(bstr("oper"), "add")) {
                StrBuf *name;
                eName = sbstr("ename");
                if (eName == NULL) {
-                       StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
+                       AppendImportantMessage(_("Invalid Parameter"), -1);
                        url_do_template();
                        return;
                }
@@ -141,24 +142,23 @@ void new_save_inetconf(void) {
                name = NewStrBufDup(eName);
                StrBufTrim(name);
                Put(Hash, nnn, nUsed, name, HFreeStrBuf); 
-               StrBufPrintf(WCC->ImportantMsg, "%s %s", 
-                            /*<domain> added status message*/ _("added."), 
-                            ChrPtr(eName));
+               AppendImportantMessage(SKEY(eName));
+               AppendImportantMessage( /*<domain> added status message*/ _(" added."), -1); 
        }
 
        Buf = NewStrBuf();
        serv_printf("CONF PUTSYS|application/x-citadel-internet-config");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) == 4) {
-               for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStrBuf)); i++) {
+               for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStr)); i++) {
                        HashPos *where;
                        const char *Key;
                        long KeyLen;
 
-                       GetHash(WCC->InetCfg, CfgNames[i].name, CfgNames[i].len, &vHash);
+                       GetHash(WCC->InetCfg, CKEY(CfgNames[i]), &vHash);
                        Hash = (HashList*) vHash;
                        if (Hash == NULL) {
-                               sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+                               AppendImportantMessage(_("Invalid Parameter"), -1);
                                url_do_template();
                                return;
                        }
@@ -167,9 +167,7 @@ void new_save_inetconf(void) {
                                while (GetNextHashPos(Hash, where, &KeyLen, &Key, &vStr)) {
                                        Str = (StrBuf*) vStr;
                                        if ((Str!= NULL) && (StrLength(Str) > 0))
-                                               serv_printf("%s|%s", 
-                                                           ChrPtr(Str),
-                                                           CfgNames[i].name); 
+                                               serv_printf("%s|%s", ChrPtr(Str), CfgNames[i].Key); 
                                }
                                DeleteHashPos(&where);
                        }                       
@@ -181,6 +179,7 @@ void new_save_inetconf(void) {
        url_do_template();
 }
 
+
 void DeleteInetConfHash(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -203,6 +202,48 @@ HashList *GetInetConfHash(StrBuf *Target, WCTemplputParams *TP)
        return vHash;
 }
 
+
+HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP) 
+{
+       StrBuf *Line;
+       HashList *ValidDomainNames = NULL;
+       long State;
+       int gvdnlevel = 0;
+       
+       serv_printf("GVDN %d", gvdnlevel);
+       Line = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatus(Line, &State) == 1) 
+       {
+               int Done = 0;
+               int n = 0;
+
+               ValidDomainNames = NewHash(1, NULL);
+               while(!Done && (StrBuf_ServGetln(Line) >= 0))
+                       if ( (StrLength(Line)==3) && 
+                            !strcmp(ChrPtr(Line), "000"))
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
+                               Put(ValidDomainNames, 
+                                   IKEY(n),
+                                   NewStrBufDup(Line), 
+                                   HFreeStrBuf);
+                               n++; /* #0 is the type... */
+                       }
+       }
+       else if (State == 550)
+               AppendImportantMessage(_("Higher access is required to access this function."), -1);
+
+       FreeStrBuf(&Line);
+
+       return ValidDomainNames;
+}
+
+
+
 void 
 InitModule_INETCONF
 (void)
@@ -210,4 +251,5 @@ InitModule_INETCONF
        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);
+       RegisterIterator("ITERATE:VALID:DOMAINNAMES", 1, NULL, GetValidDomainNames, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 }