/*
* $Id$
+ *
+ * Functions which handle Internet domain configuration etc.
*/
-/**
- * \defgroup InetCfg Functions which handle Internet domain configuration etc.
- * \ingroup CitadelConfig
- */
-/*@{*/
-#include "webcit.h"
+#include "webcit.h"
+#include "webserver.h"
-/**
- * \brief display the inet config dialog
+/*
+ * display the inet config dialog
*/
void display_inetconf(void)
{
char etype[SIZ];
int i;
int which;
+ int bg = 0;
enum {
ic_localhost,
ic_directory,
- ic_gwdom,
ic_smarthost,
ic_rbl,
ic_spamass,
ic_masq,
+ ic_clamav,
ic_max
};
+
char *ic_spec[ic_max];
char *ic_misc;
char *ic_keyword[ic_max];
char *ic_boxtitle[ic_max];
char *ic_desc[ic_max];
- /* DON'T NEVER EVER AGAIN TRANSLATE CITADEL COMMANDS! */
+ /* These are server config keywords; do not localize! */
ic_keyword[0] = "localhost";
ic_keyword[1] = "directory";
- ic_keyword[2] = "gatewaydomain";
- ic_keyword[3] = "smarthost";
- ic_keyword[4] = "rbl";
- ic_keyword[5] = "spamassassin";
- ic_keyword[6] = "masqdomain";
-
+ ic_keyword[2] = "smarthost";
+ ic_keyword[3] = "rbl";
+ ic_keyword[4] = "spamassassin";
+ ic_keyword[5] = "masqdomain";
+ ic_keyword[6] = "clamav";
ic_boxtitle[0] = _("Local host aliases");
ic_boxtitle[1] = _("Directory domains");
- ic_boxtitle[2] = _("Gateway domains");
- ic_boxtitle[3] = _("Smart hosts");
- ic_boxtitle[4] = _("RBL hosts");
- ic_boxtitle[5] = _("SpamAssassin hosts");
- ic_boxtitle[6] = _("Masqueradable domains");
+ ic_boxtitle[2] = _("Smart hosts");
+ ic_boxtitle[3] = _("RBL hosts");
+ ic_boxtitle[4] = _("SpamAssassin hosts");
+ ic_boxtitle[5] = _("Masqueradable domains");
+ ic_boxtitle[6] = _("ClamAV clamd hosts");
ic_desc[0] = _("(domains for which this host receives mail)");
ic_desc[1] = _("(domains mapped with the Global Address Book)");
- ic_desc[2] = _("(domains whose subdomains match Citadel hosts)");
- ic_desc[3] = _("(if present, forward all outbound mail to one of these hosts)");
- ic_desc[4] = _("(hosts running a Realtime Blackhole List)");
- ic_desc[5] = _("(hosts running the SpamAssassin service)");
- ic_desc[6] = _("(Domains as which users are allowed to masquerade)");
+ ic_desc[2] = _("(if present, forward all outbound mail to one of these hosts)");
+ ic_desc[3] = _("(hosts running a Realtime Blackhole List)");
+ ic_desc[4] = _("(hosts running the SpamAssassin service)");
+ ic_desc[5] = _("(Domains as which users are allowed to masquerade)");
+ ic_desc[6] = _("(hosts running the ClamAV clamd service)");
for (i=0; i<ic_max; ++i) {
ic_spec[i] = strdup("");
}
+
ic_misc = strdup("");
serv_printf("CONF GETSYS|application/x-citadel-internet-config");
wprintf("<div id=\"content\" class=\"service\">\n");
wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table border=0 width=100%% cellspacing=\"10px\" cellpadding=\"10px\"> "
+ "<table border=0 width=100%% cellspacing=\"10\" cellpadding=\"10\"> "
"<tr><td valign=top width=50%%>\n");
for (which=0; which<ic_max; ++which) {
if (which == (ic_max / 2)) {
wprintf("</td><td valign=top>");
}
- svprintf("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
- do_template("beginbox");
+ svput("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
+ do_template("beginbox", NULL);
wprintf("<span class=\"menudesc\">");
escputs(ic_desc[which]);
wprintf("</span><br />");
- wprintf("<table border=0 cellspacing=\"2px\" cellpadding=\"2px\" width=94%%>\n");
+ wprintf("<table border=0 cellspacing=\"2px\" cellpadding=\"2px\" width=94%% "
+ "class=\"altern\" >\n");
+ bg = 0;
if (!IsEmptyStr(ic_spec[which])) {
for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
- wprintf("<tr><td align=left>");
+ bg = 1 - bg;
+ wprintf("<tr class=\"%s\">",
+ (bg ? "even" : "odd")
+ );
+ wprintf("<td align=left>");
extract_token(buf, ic_spec[which], i, '\n', sizeof buf);
escputs(buf);
wprintf("</td><td align=left>"
wprintf(_("Delete"));
wprintf("</a></span></td></tr>\n");
}
+
}
wprintf("<form method=\"post\" action=\"save_inetconf\">\n");
- wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<tr><td>"
"<input type=\"text\" name=\"ename\" maxlength=\"64\">"
"<input type=\"hidden\" name=\"etype\" VALUE=\"%s\">", ic_keyword[which]);
wprintf("</td><td align=left>"
"<input type=\"submit\" name=\"oper\" value=\"Add\">"
"</td></tr></table></form>\n");
- do_template("endbox");
+ do_template("endbox", NULL);
wprintf("<br />");
}
wprintf("</td></tr></table></div>\n");
}
-/**
- * \brief save changes to the inet config
+
+/*
+ * save changes to the inet config
*/
void save_inetconf(void) {
char *buf;
extract_token(ename, buf, 0, '|', SIZ);
extract_token(etype, buf, 1, '|', SIZ);
if (IsEmptyStr(buf)) {
- /** skip blank lines */
+ /* skip blank lines */
}
else if ((!strcasecmp(ename, bstr("ename")))
&& (!strcasecmp(etype, bstr("etype")))
serv_puts(newconfig);
if (!strcasecmp(bstr("oper"), "add")) {
serv_printf("%s|%s", bstr("ename"), bstr("etype") );
- sprintf(WC->ImportantMessage, "%s added.", bstr("ename"));
+ sprintf(WC->ImportantMessage, _("%s added."), bstr("ename"));
}
serv_puts("000");
}
free(newconfig);
}
+typedef enum _e_cfg {
+ ic_localhost,
+ ic_directory,
+ ic_smarthost,
+ ic_rbl,
+ ic_spamass,
+ ic_masq,
+ ic_clamav,
+ ic_max
+} ECfg;
+
+typedef struct _ConstStrBuf {
+ const char *name;
+ size_t len;
+} ConstStrBuf;
+
+
+ /* These are server config keywords; do not localize! */
+ConstStrBuf CfgNames[] = {
+ { HKEY("localhost") },
+ { HKEY("directory") },
+ { HKEY("smarthost") },
+ { HKEY("rbl") },
+ { HKEY("spamassassin") },
+ { HKEY("masqdomain") },
+ { HKEY("clamav") }
+};
+
+
+
+
+/*
+ * display the inet config dialog
+ */
+void load_inetconf(void)
+{
+ struct wcsession *WCC = WC;
+ StrBuf *Buf, *Token, *Value;
+ 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++) {
+ Hash = NewHash(1, NULL);
+ Put(WCC->InetCfg, CfgNames[i].name, CfgNames[i].len, Hash, HDeleteHash);
+ }
+
+ serv_printf("CONF GETSYS|application/x-citadel-internet-config");
+ serv_getln(buf, sizeof buf);
+
+ if (buf[0] == '1') {
+ Buf = NewStrBuf();
+ Token = NewStrBuf();
+ while ((len = StrBuf_ServGetln(Buf),
+ strcmp(ChrPtr(Buf), "000"))) {
+ Value = NewStrBuf();
+
+ StrBufExtract_token(Token, Buf, 1, '|');
+ StrBufExtract_token(Value, Buf, 0, '|');
+ GetHash(WCC->InetCfg, ChrPtr(Token), StrLength(Token), &vHash);
+ Hash = (HashList*) vHash;
+ if (Hash == NULL) {
+ lprintf(1, "ERROR Loading inet config line: [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Value);
+ continue;
+ }
+ nUsed = GetCount(Hash);
+ nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
+ Put(Hash, nnn, nUsed, Value, HFreeStrBuf);
+ }
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&Token);
+ }
+}
+
+
+/*
+ * save changes to the inet config
+ */
+void new_save_inetconf(void) {
+ struct wcsession *WCC = WC;
+ HashList *Hash;
+ StrBuf *Str;
+ const StrBuf *eType, *eNum, *eName;
+ char nnn[64];
+ void *vHash, *vStr;
+ char buf[SIZ];
+ int i, nUsed;
+
+ load_inetconf();
+ eType = sbstr("etype");
+
+ GetHash(WCC->InetCfg, ChrPtr(eType), StrLength(eType), &vHash);
+ Hash = (HashList*) vHash;
+ if (Hash == NULL) {
+ sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ url_do_template();
+ return;
+ }
+
+ if (strcasecmp(bstr("oper"), "delete") == 0) {
+ eNum = sbstr("ename");
+ if (!GetHash(Hash, ChrPtr(eNum), StrLength(eNum), &vStr) ||
+ (vStr == NULL)) {
+ sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ url_do_template();
+ return;
+ }
+
+ Str = (StrBuf*)vStr;
+ sprintf(WC->ImportantMessage, _("%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"));
+ 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));
+ }
+
+ 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++) {
+ HashPos *where;
+ const char *Key;
+ long KeyLen;
+
+ GetHash(WCC->InetCfg, CfgNames[i].name, CfgNames[i].len, &vHash);
+ Hash = (HashList*) vHash;
+ if (Hash == NULL) {
+ sprintf(WC->ImportantMessage, _("Invalid Parameter"));
+ url_do_template();
+ return;
+ }
+ if (GetCount(Hash) > 0) {
+ where = GetNewHashPos();
+ 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);
+ }
+ DeleteHashPos(&where);
+ }
+ }
+ serv_puts("000");
+ DeleteHash(&WCC->InetCfg);
+ }
+
+ url_do_template();
+}
+
+void InetCfgSubst(StrBuf *TemplBuffer, void *vContext, WCTemplateToken *Token)
+{
+ SVPutBuf("SERVCFG:INET:HOSTNAME", vContext, 1);
+}
+
+void DeleteInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+ struct wcsession *WCC = WC;
+ if (WCC->InetCfg != NULL)
+ DeleteHash(&WCC->InetCfg);
-/*@}*/
+}
+
+
+HashList *GetInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+ struct wcsession *WCC = WC;
+ void *vHash;
+
+ if (WCC->InetCfg == NULL)
+ load_inetconf();
+ GetHash(WCC->InetCfg,
+ Tokens->Params[2]->Start,
+ Tokens->Params[2]->len,
+ &vHash);
+ svprintf(HKEY("SERVCFG:INET:TYPE"), WCS_STRING, Tokens->Params[2]->Start);
+ return vHash;
+}
+
+void
+InitModule_INETCONF
+(void)
+{
+ WebcitAddUrlHandler(HKEY("display_inetconf"), display_inetconf, 0);
+ WebcitAddUrlHandler(HKEY("save_inetconf"), new_save_inetconf, AJAX);
+ RegisterIterator("SERVCFG:INET", 1, NULL, GetInetConfHash, InetCfgSubst, NULL, CTX_INETCFG, CTX_NONE);
+ RegisterNamespace("SERVCFG:FLUSHINETCFG",0, 0, DeleteInetConfHash, CTX_NONE);
+}