void display_netconf(void);
+CtxType CTX_NODECONF = CTX_NONE;
/*----------------------------------------------------------------------*/
/* Business Logic */
/*----------------------------------------------------------------------*/
char nnn[64];
char buf[SIZ];
int nUsed;
- long len;
NodeConf *Node;
serv_puts("CONF getsys|application/x-citadel-ignet-config");
Hash = NewHash(1, NULL);
Buf = NewStrBuf();
- while ((len = StrBuf_ServGetln(Buf),
- (len != 3) || !strcmp(ChrPtr(Buf), "000"))) {
+ while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
Node = NewNode(Buf);
- if (Node == NULL)
- continue;
- nUsed = GetCount(Hash);
- nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
- Put(Hash, nnn, nUsed, Node, DeleteNodeConf);
+ if (Node != NULL) {
+ nUsed = GetCount(Hash);
+ nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
+ Put(Hash, nnn, nUsed, Node, DeleteNodeConf);
+ }
}
FreeStrBuf(&Buf);
return Hash;
Index = sbstr("index");
NewNode = HttpGetNewNode();
if ((NewNode == NULL) || (Index == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
Index = sbstr("index");
if (Index == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
NodeConfig = load_netconf(NULL, &NoCtx);
if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) ||
(vNode == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
DeleteHash(&NodeConfig);
return;
}
-
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_NODECONF;
- SubTP.Context = vNode;
- begin_burst();
- Tmpl = sbstr("template");
- output_headers(1, 0, 0, 0, 1, 0);
- DoTemplate(SKEY(Tmpl), NULL, &SubTP);
- end_burst();
+ StackContext(NULL, &SubTP, vNode, CTX_NODECONF, 0, NULL);
+ {
+ begin_burst();
+ Tmpl = sbstr("template");
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(SKEY(Tmpl), NULL, &SubTP);
+ end_burst();
+ }
+ UnStackContext(&SubTP);
DeleteHash(&NodeConfig);
}
Index = sbstr("index");
if (Index == NULL) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
return;
}
NodeConfig = load_netconf(NULL, &NoCtx);
if (!GetHash(NodeConfig, ChrPtr(Index), StrLength(Index), &vNode) ||
(vNode == NULL)) {
- sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ AppendImportantMessage(_("Invalid Parameter"), -1);
url_do_template();
DeleteHash(&NodeConfig);
return;
void tmplput_NodeName(StrBuf *Target, WCTemplputParams *TP)
{
- NodeConf *Node = (NodeConf*) CTX;
+ NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF);
StrBufAppendTemplate(Target, TP, Node->NodeName, 0);
}
void tmplput_Secret(StrBuf *Target, WCTemplputParams *TP)
{
- NodeConf *Node = (NodeConf*) CTX;
+ NodeConf *Node = (NodeConf*) CTX(CTX_NODECONF);
StrBufAppendTemplate(Target, TP, Node->Secret, 0);
}
void tmplput_Host(StrBuf *Target, WCTemplputParams *TP)
{
- NodeConf *Node= (NodeConf*) CTX;
+ NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF);
StrBufAppendTemplate(Target, TP, Node->Host, 0);
}
void tmplput_Port(StrBuf *Target, WCTemplputParams *TP)
{
- NodeConf *Node= (NodeConf*) CTX;
+ NodeConf *Node= (NodeConf*) CTX(CTX_NODECONF);
StrBufAppendTemplate(Target, TP, Node->Port, 0);
}
InitModule_NETCONF
(void)
{
+ RegisterCTX(CTX_NODECONF);
WebcitAddUrlHandler(HKEY("display_edit_node"), "", 0, display_edit_node, 0);
WebcitAddUrlHandler(HKEY("aide_ignetconf_edit_node"), "", 0, edit_node, 0);