X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Finetconf.c;h=d7707f019c3804df68354361b2cb9f047fce1f88;hb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;hp=126e4afae5c1cb509da866506d24cff7b3973d1d;hpb=5b9736dec3d511d35fb4a86ff913afcf9d7a811c;p=citadel.git

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 126e4afae..d7707f019 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -1,245 +1,36 @@
 /* 
- * $Id$
- *
  * Functions which handle Internet domain configuration etc.
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-/*
- * display the inet config dialog 
- */
-void display_inetconf(void)
-{
-	char buf[SIZ];
-	char ename[SIZ];
-	char etype[SIZ];
-	int i;
-	int which;
-	int bg = 0;
-
-	enum {
-		ic_localhost,
-		ic_directory,
-		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];
-
-	/* These are server config keywords; do not localize! */
-	ic_keyword[0] = "localhost";
-	ic_keyword[1] = "directory";
-	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] = _("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] = _("(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");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-		extract_token(ename, buf, 0, '|', sizeof ename);
-		extract_token(etype, buf, 1, '|', sizeof etype);
-		which = (-1);
-		for (i=0; i<ic_max; ++i) {
-			if (!strcasecmp(etype, ic_keyword[i])) {
-				which = i;
-			}
-		}
-
-		if (which >= 0) {
-			ic_spec[which] = realloc(ic_spec[which], strlen(ic_spec[which]) + strlen(ename) + 2);
-			if (!IsEmptyStr(ic_spec[which])) strcat(ic_spec[which], "\n");
-			strcat(ic_spec[which], ename);
-		}
-		else {
-			ic_misc = realloc(ic_misc, strlen(ic_misc) + strlen(buf) + 2);
-			if (!IsEmptyStr(ic_misc)) strcat(ic_misc, "\n");
-			strcat(ic_misc, buf);
-		}
-
-	}
-
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Internet configuration"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
-
-	wprintf("<div id=\"content\" class=\"service\">\n");
-
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<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>");
-		}
-		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%% "
-			"class=\"altern\" >\n");
-		bg = 0;
-		if (!IsEmptyStr(ic_spec[which])) {
-			for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
-                        	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>"
-					"<span class=\"button_link\">"
-					"<a href=\"save_inetconf?oper=delete&ename=");
-				escputs(buf);
-				wprintf("&etype=%s\" ", ic_keyword[which]);
-				wprintf("onClick=\"return confirm('%s');\">",
-					_("Delete this entry?"));
-				wprintf(_("Delete"));
-				wprintf("</a></span></td></tr>\n");
-			}
-
-		}
-		wprintf("<form method=\"post\" action=\"save_inetconf\">\n");
-		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", NULL);
-		wprintf("<br />");
-	}
-	wprintf("</td></tr></table></div>\n");
-	wDumpContent(1);
-
-	for (i=0; i<ic_max; ++i) {
-		free(ic_spec[i]);
-	}
-	free(ic_misc);
-}
-
-
-
-/*
- * save changes to the inet config
- */
-void save_inetconf(void) {
-	char *buf;
-	char *ename;
-	char *etype;
-	char *newconfig;
-
-	buf = malloc(SIZ);
-	ename = malloc(SIZ);
-	etype = malloc(SIZ);
-	newconfig = malloc(65536);
-
-	strcpy(newconfig, "");
-	serv_printf("CONF GETSYS|application/x-citadel-internet-config");
-	serv_getln(buf, SIZ);
-	if (buf[0] == '1') while (serv_getln(buf, SIZ), strcmp(buf, "000")) {
-		extract_token(ename, buf, 0, '|', SIZ);
-		extract_token(etype, buf, 1, '|', SIZ);
-		if (IsEmptyStr(buf)) {
-			/* skip blank lines */
-		}
-		else if ((!strcasecmp(ename, bstr("ename")))
-		   &&   (!strcasecmp(etype, bstr("etype")))
-		   &&	(!strcasecmp(bstr("oper"), "delete"))
-		) {
-			sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
-		}
-		else {
-			if (!IsEmptyStr(newconfig)) strcat(newconfig, "\n");
-			strcat(newconfig, buf);
-		}
-	}
-
-	serv_printf("CONF PUTSYS|application/x-citadel-internet-config");
-	serv_getln(buf, SIZ);
-	if (buf[0] == '4') {
-		serv_puts(newconfig);
-		if (!strcasecmp(bstr("oper"), "add")) {
-			serv_printf("%s|%s", bstr("ename"), bstr("etype") );
-			sprintf(WC->ImportantMessage, _("%s added."), bstr("ename"));
-		}
-		serv_puts("000");
-	}
-	
-	display_inetconf();
-
-	free(buf);
-	free(ename);
-	free(etype);
-	free(newconfig);
-}
 
 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") }
 };
 
 	
@@ -250,37 +41,39 @@ ConstStrBuf CfgNames[] = {
  */
 void load_inetconf(void)
 {
-	struct wcsession *WCC = WC;
-	StrBuf *Buf, *Token, *Value;
+	wcsession *WCC = WC;
+	StrBuf *Buf, *CfgToken, *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++) {
+	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();
-		Token = NewStrBuf();
+	Buf = NewStrBuf();
+	StrBuf_ServGetln(Buf);
+		
+	if (GetServerStatus(Buf, NULL) == 1) {
+		CfgToken = NewStrBuf();
 		while ((len = StrBuf_ServGetln(Buf),
-			strcmp(ChrPtr(Buf), "000"))) {
+			((len >= 0) && 
+			 ((len != 3) ||
+			  strcmp(ChrPtr(Buf), "000")))))
+		{
 			Value = NewStrBuf();
  
-			StrBufExtract_token(Token, Buf, 1, '|');
+			StrBufExtract_token(CfgToken, Buf, 1, '|');
 			StrBufExtract_token(Value, Buf, 0, '|');
-			GetHash(WCC->InetCfg, ChrPtr(Token), StrLength(Token), &vHash);
+			GetHash(WCC->InetCfg, ChrPtr(CfgToken), StrLength(CfgToken), &vHash);
 			Hash = (HashList*) vHash;
 			if (Hash == NULL) {
-				lprintf(1, "ERROR Loading inet config line: [%s]\n", 
+				syslog(1, "ERROR Loading inet config line: [%s]\n", 
 					ChrPtr(Buf));
 				FreeStrBuf(&Value);
 				continue;
@@ -289,9 +82,9 @@ void load_inetconf(void)
 			nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
 			Put(Hash, nnn, nUsed, Value, HFreeStrBuf); 
 		}
-		FreeStrBuf(&Buf);
-		FreeStrBuf(&Token);
+		FreeStrBuf(&CfgToken);
 	}
+	FreeStrBuf(&Buf);
 }
 
 
@@ -299,13 +92,13 @@ void load_inetconf(void)
  * save changes to the inet config
  */
 void new_save_inetconf(void) {
-	struct wcsession *WCC = WC;
+	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();
@@ -314,7 +107,7 @@ void new_save_inetconf(void) {
 	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;
 	}
@@ -323,53 +116,58 @@ void new_save_inetconf(void) {
 		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;
 			}
 			if (GetCount(Hash) > 0) {
-				where = GetNewHashPos();
+				where = GetNewHashPos(Hash, 0);
 				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); 
+							    CfgNames[i].Key); 
 				}
 				DeleteHashPos(&where);
 			}			
@@ -377,18 +175,13 @@ void new_save_inetconf(void) {
 		serv_puts("000");
 		DeleteHash(&WCC->InetCfg);
 	}
-	
+	FreeStrBuf(&Buf);
 	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)
+void DeleteInetConfHash(StrBuf *Target, WCTemplputParams *TP)
 {
-	struct wcsession *WCC = WC;
+	wcsession *WCC = WC;
 
 	if (WCC->InetCfg != NULL)
 		DeleteHash(&WCC->InetCfg);
@@ -396,18 +189,15 @@ void DeleteInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Token, void
 }
 
 
-HashList *GetInetConfHash(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *GetInetConfHash(StrBuf *Target, WCTemplputParams *TP)
 {
-	struct wcsession *WCC = WC;
+	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);
+	GetHash(WCC->InetCfg, TKEY(5), &vHash);
+	PutBstr(HKEY("__SERVCFG:INET:TYPE"), NewStrBufPlain(TKEY(5)));
 	return vHash;
 }
 
@@ -415,8 +205,7 @@ 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);
-	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);
 }