From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 29 Aug 2010 16:56:01 +0000 (+0000)
Subject: * don't use sv* here
X-Git-Tag: v8.01~829
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=45c779ec45fe9c7c95fdef40c2e77b92ad2cd44d

* don't use sv* here
---

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 269967e4a..4adb07e09 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -183,11 +183,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)
 {
 	wcsession *WCC = WC;
@@ -206,7 +201,7 @@ 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;
 }
 
@@ -215,6 +210,6 @@ InitModule_INETCONF
 (void)
 {
 	WebcitAddUrlHandler(HKEY("save_inetconf"), "", 0, new_save_inetconf, 0);
-	RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, InetCfgSubst, NULL, CTX_INETCFG, CTX_NONE, IT_NOFLAG);
+	RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 	RegisterNamespace("SERVCFG:FLUSHINETCFG",0, 0, DeleteInetConfHash, NULL, CTX_NONE);
 }
diff --git a/webcit/static/t/aide/inet/section.html b/webcit/static/t/aide/inet/section.html
index 4ca3a0c84..8608e1b59 100644
--- a/webcit/static/t/aide/inet/section.html
+++ b/webcit/static/t/aide/inet/section.html
@@ -1,5 +1,5 @@
 <tr class='<?ITERATE:ODDEVEN>'>
-<td align=left><?SERVCFG:INET:HOSTNAME></td><td align=left>
+<td align=left><?CONTEXTSTR></td><td align=left>
 <span class="button_link">
-<a href='save_inetconf?template=aide_display_inetconf&oper=delete&ename=<?ITERATE:KEY>&etype=<?SERVCFG:INET:TYPE>' onClick="return confirm('<?_("Delete this entry?")>')" >
+<a href='save_inetconf?template=aide_display_inetconf&oper=delete&ename=<?ITERATE:KEY>&etype=<?BSTR("__SERVCFG:INET:TYPE")>' onClick="return confirm('<?_("Delete this entry?")>')" >
 <?_("Delete")> </a></span></td></tr>