X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Finetconf.c;h=b52d5df25650dcdf492a0dd720b6af77b56fa0bb;hb=6562581c86e3306312dda194f95883d873a43bd5;hp=70c707191de696a1e9034447f4bd4e03f752d083;hpb=dbe6bf2006bcf105a8e3a2dad891d6c698831e2f;p=citadel.git

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 70c707191..b52d5df25 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -1,16 +1,13 @@
 /* 
  * $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"
 
-/**
- * \brief display the inet config dialog 
+/*
+ * display the inet config dialog 
  */
 void display_inetconf(void)
 {
@@ -19,52 +16,50 @@ 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_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_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_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)");
 
 	for (i=0; i<ic_max; ++i) {
 		ic_spec[i] = strdup("");
 	}
+
 	ic_misc = strdup("");
 
 	serv_printf("CONF GETSYS|application/x-citadel-internet-config");
@@ -82,12 +77,12 @@ void display_inetconf(void)
 
 		if (which >= 0) {
 			ic_spec[which] = realloc(ic_spec[which], strlen(ic_spec[which]) + strlen(ename) + 2);
-			if (strlen(ic_spec[which]) > 0) strcat(ic_spec[which], "\n");
+			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 (strlen(ic_misc) > 0) strcat(ic_misc, "\n");
+			if (!IsEmptyStr(ic_misc)) strcat(ic_misc, "\n");
 			strcat(ic_misc, buf);
 		}
 
@@ -95,49 +90,59 @@ void display_inetconf(void)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 	wprintf("<div id=\"banner\">\n");
-	wprintf("<TABLE class=\"inetconf_banner\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">");
+	wprintf("<h1>");
 	wprintf(_("Internet configuration"));
-	wprintf("</SPAN>\n");
-	wprintf("</TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
+	wprintf("</h1>");
+	wprintf("</div>\n");
+
+	wprintf("<div id=\"content\" class=\"service\">\n");
 
 	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%%><tr><td valign=top>\n");
+		"<table border=0 width=100%% cellspacing=\"10px\" cellpadding=\"10px\"> "
+		"<tr><td valign=top width=50%%>\n");
 	for (which=0; which<ic_max; ++which) {
 		if (which == (ic_max / 2)) {
-			wprintf("</TD><TD VALIGN=TOP>");
+			wprintf("</td><td valign=top>");
 		}
 		svprintf("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
 		do_template("beginbox");
 		wprintf("<span class=\"menudesc\">");
 		escputs(ic_desc[which]);
 		wprintf("</span><br />");
-		wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
-		if (strlen(ic_spec[which]) > 0) {
+		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=RIGHT>"
+				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("<font size=-1>");
-				wprintf(_("(Delete)"));
-				wprintf("</font></a></TD></TR>\n");
+				wprintf(_("Delete"));
+				wprintf("</a></span></td></tr>\n");
 			}
+
 		}
-		wprintf("<FORM METHOD=\"POST\" action=\"save_inetconf\">\n"
-			"<TR><TD>"
-			"<INPUT TYPE=\"text\" NAME=\"ename\" MAXLENGTH=\"64\">"
-			"<INPUT TYPE=\"hidden\" NAME=\"etype\" VALUE=\"%s\">", ic_keyword[which]);
-		wprintf("</TD><TD ALIGN=RIGHT>"
-			"<INPUT TYPE=\"submit\" NAME=\"oper\" VALUE=\"Add\">"
-			"</TD></TR></TABLE></FORM>\n");
+		wprintf("<form method=\"post\" action=\"save_inetconf\">\n");
+		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\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");
+		wprintf("<br />");
 	}
 	wprintf("</td></tr></table></div>\n");
 	wDumpContent(1);
@@ -149,8 +154,8 @@ void display_inetconf(void)
 }
 
 
-/**
- * \brief save changes to the inet config
+/*
+ * save changes to the inet config
  */
 void save_inetconf(void) {
 	char *buf;
@@ -169,8 +174,8 @@ void save_inetconf(void) {
 	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 (strlen(buf) == 0) {
-			/** skip blank lines */
+		if (IsEmptyStr(buf)) {
+			/* skip blank lines */
 		}
 		else if ((!strcasecmp(ename, bstr("ename")))
 		   &&   (!strcasecmp(etype, bstr("etype")))
@@ -179,7 +184,7 @@ void save_inetconf(void) {
 			sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
 		}
 		else {
-			if (strlen(newconfig) > 0) strcat(newconfig, "\n");
+			if (!IsEmptyStr(newconfig)) strcat(newconfig, "\n");
 			strcat(newconfig, buf);
 		}
 	}
@@ -202,7 +207,3 @@ void save_inetconf(void) {
 	free(etype);
 	free(newconfig);
 }
-
-
-
-/*@}*/