void *vHash;
HashList *Hash;
char nnn[64];
- char buf[SIZ];
int i, len, nUsed;
WCC->InetCfg = NewHash(1, NULL);
}
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"))) {
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"));
+ StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
url_do_template();
return;
}
eNum = sbstr("ename");
if (!GetHash(Hash, ChrPtr(eNum), StrLength(eNum), &vStr) ||
(vStr == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
url_do_template();
return;
}
Str = (StrBuf*)vStr;
- sprintf(WC->ImportantMessage, _("%s has been deleted."), ChrPtr(Str));
+ StrBufPrintf(WCC->ImportantMsg, _("%s has been deleted."), ChrPtr(Str));
FlushStrBuf(Str);
}
else if (!strcasecmp(bstr("oper"), "add")) {
eName = sbstr("ename");
if (eName == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ StrBufPrintf(WCC->ImportantMsg, _("Invalid Parameter"));
url_do_template();
return;
}
nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
Put(Hash, nnn, nUsed, NewStrBufDup(eName), HFreeStrBuf);
- sprintf(WC->ImportantMessage, "%s added.", ChrPtr(eName));
+ StrBufPrintf(WCC->ImportantMsg, "%s %s",
+ /*<domain> added status message*/ _("added."),
+ ChrPtr(eName));
}
+ Buf = NewStrBuf();
serv_printf("CONF PUTSYS|application/x-citadel-internet-config");
- serv_getln(buf, SIZ);
- if (buf[0] == '4') {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 4) {
for (i = 0; i < (sizeof(CfgNames) / sizeof(ConstStrBuf)); i++) {
HashPos *where;
const char *Key;
serv_puts("000");
DeleteHash(&WCC->InetCfg);
}
-
+ FreeStrBuf(&Buf);
url_do_template();
}
-void InetCfgSubst(StrBuf *TemplBuffer, void *vContext, WCTemplateToken *Tokens)
+void InetCfgSubst(StrBuf *TemplBuffer, WCTemplputParams *TP)
{
- SVPutBuf("SERVCFG:INET:HOSTNAME", vContext, 1);
+ SVPutBuf("SERVCFG:INET:HOSTNAME", CTX, 1);
}
-void DeleteInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void DeleteInetConfHash(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
}
-HashList *GetInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *GetInetConfHash(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
void *vHash;
if (WCC->InetCfg == NULL)
load_inetconf();
- GetHash(WCC->InetCfg, TKEY(2), &vHash);
- svprintf(HKEY("SERVCFG:INET:TYPE"), WCS_STRING, Tokens->Params[2]->Start);
+ GetHash(WCC->InetCfg, TKEY(5), &vHash);
+ svprintf(HKEY("SERVCFG:INET:TYPE"), WCS_STRING, TP->Tokens->Params[5]->Start);
return vHash;
}
InitModule_INETCONF
(void)
{
- WebcitAddUrlHandler(HKEY("save_inetconf"), new_save_inetconf, AJAX);
- RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, InetCfgSubst, NULL, CTX_INETCFG, CTX_NONE);
+ 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);
}