/*
- * $Id$
- *
* Functions which handle Internet domain configuration etc.
*/
#include "webcit.h"
-#include "webserver.h"
+
typedef enum _e_cfg {
ic_localhost,
ic_directory,
ic_smarthost,
+ ic_fallback,
ic_rbl,
ic_spamass,
ic_masq,
ic_clamav,
+ ic_notify,
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") },
- { HKEY("clamav") }
+ { HKEY("clamav") },
+ { HKEY("notify") }
};
void *vHash;
HashList *Hash;
char nnn[64];
- char buf[SIZ];
int i, len, nUsed;
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");
- serv_getln(buf, sizeof buf);
-
- if (buf[0] == '1') {
- Buf = NewStrBuf();
+ Buf = NewStrBuf();
+ StrBuf_ServGetln(Buf);
+
+ 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;
}
nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
Put(Hash, nnn, nUsed, Value, HFreeStrBuf);
}
- FreeStrBuf(&Buf);
FreeStrBuf(&CfgToken);
}
+ FreeStrBuf(&Buf);
}
wcsession *WCC = WC;
HashList *Hash;
StrBuf *Str;
+ StrBuf *Buf;
const StrBuf *eType, *eNum, *eName;
char nnn[64];
void *vHash, *vStr;
- char buf[SIZ];
int i, nUsed;
load_inetconf();
GetHash(WCC->InetCfg, ChrPtr(eType), StrLength(eType), &vHash);
Hash = (HashList*) vHash;
if (Hash == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
eNum = sbstr("ename");
if (!GetHash(Hash, ChrPtr(eNum), StrLength(eNum), &vStr) ||
(vStr == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
Str = (StrBuf*)vStr;
- sprintf(WC->ImportantMessage, _("%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) {
- sprintf(WC->ImportantMessage, _("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);
- sprintf(WC->ImportantMessage, "%s added.", ChrPtr(eName));
+ name = NewStrBufDup(eName);
+ StrBufTrim(name);
+ Put(Hash, nnn, nUsed, name, HFreeStrBuf);
+ AppendImportantMessage(SKEY(eName));
+ AppendImportantMessage( /*<domain> added status message*/ _(" added."), -1);
}
+ Buf = NewStrBuf();
serv_printf("CONF PUTSYS|application/x-citadel-internet-config");
- serv_getln(buf, SIZ);
- if (buf[0] == '4') {
- for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStrBuf)); i++) {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 4) {
+ 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;
}
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);
}
serv_puts("000");
DeleteHash(&WCC->InetCfg);
}
-
+ FreeStrBuf(&Buf);
url_do_template();
}
-void InetCfgSubst(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
- SVPutBuf("SERVCFG:INET:HOSTNAME", CTX, 1);
-}
void DeleteInetConfHash(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, AJAX);
- 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);
}
projects / citadel.git / blobdiff