X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Finetconf.c;h=265f3f6bd1f61fc177eef28bd72c247fb0df1ca5;hb=3a308abf0c7a376902be8d5140d3ffc2cf9a0b2f;hp=40966f24eb6284183f5f0c0bfe048d5c3b320123;hpb=9c04876f6d40ba51a047c32bf250d625250f2312;p=citadel.git diff --git a/webcit/inetconf.c b/webcit/inetconf.c index 40966f24e..265f3f6bd 100644 --- a/webcit/inetconf.c +++ b/webcit/inetconf.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Functions which handle Internet domain configuration etc. */ @@ -12,6 +10,7 @@ typedef enum _e_cfg { ic_localhost, ic_directory, ic_smarthost, + ic_fallback, ic_rbl, ic_spamass, ic_masq, @@ -20,17 +19,13 @@ 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") }, + { HKEY("fallbackhost") }, { HKEY("rbl") }, { HKEY("spamassassin") }, { HKEY("masqdomain") }, @@ -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,45 +118,47 @@ 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; } nUsed = GetCount(Hash); nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1); - - Put(Hash, nnn, nUsed, NewStrBufDup(eName), HFreeStrBuf); - StrBufPrintf(WCC->ImportantMsg, "%s %s", - /* added status message*/ _("added."), - ChrPtr(eName)); + name = NewStrBufDup(eName); + StrBufTrim(name); + Put(Hash, nnn, nUsed, name, HFreeStrBuf); + AppendImportantMessage(SKEY(eName)); + AppendImportantMessage( /* 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; } @@ -165,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); } @@ -179,10 +179,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) { @@ -202,15 +198,58 @@ 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; } + +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) { - 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); + RegisterIterator("ITERATE:VALID:DOMAINNAMES", 1, NULL, GetValidDomainNames, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG); }