* inetconf.c: in save_inetconf(), eliminate sizeof(x) where x is a pointer
[citadel.git] / webcit / inetconf.c
index 7ccf7c1257bbd65d068e538f2710655839b23e92..5bfc232c2ba0ef29a9ffc1db03a42348c721f2f6 100644 (file)
@@ -1,9 +1,8 @@
 /* 
- * inetconf.c
+ * $Id$
  *
  * Functions which handle Internet domain configuration etc.
  *
- * $Id$
  */
 
 #include <ctype.h>
@@ -39,11 +38,11 @@ void display_inetconf(void)
 
        enum {
                ic_localhost,
-               ic_gwdom,
                ic_directory,
-               ic_spamass,
-               ic_rbl,
+               ic_gwdom,
                ic_smarthost,
+               ic_rbl,
+               ic_spamass,
                ic_max
        };
        char *ic_spec[ic_max];
@@ -51,29 +50,29 @@ void display_inetconf(void)
 
        char *ic_keyword[] = {
                "localhost",
-               "gatewaydomain",
                "directory",
-               "spamassassin",
+               "gatewaydomain",
+               "smarthost",
                "rbl",
-               "smarthost"
+               "spamassassin",
        };
 
        char *ic_boxtitle[] = {
                "Local host aliases",
-               "Gateway domains",
                "Directory domains",
-               "SpamAssassin hosts",
+               "Gateway domains",
+               "Smart hosts",
                "RBL hosts",
-               "Smart hosts"
+               "SpamAssassin hosts",
        };
 
        char *ic_desc[] = {
                "(domains for which this host receives mail)",
-               "(domains whose subdomains match Citadel hosts)",
                "(domains mapped with the Global Address Book)",
-               "(hosts running the SpamAssassin service)",
+               "(domains whose subdomains match Citadel hosts)",
+               "(if present, forward all outbound mail to one of these hosts)",
                "(hosts running a Realtime Blackhole List)",
-               "(if present, forward all outbound mail to one of these hosts)"
+               "(hosts running the SpamAssassin service)",
        };
 
        for (i=0; i<ic_max; ++i) {
@@ -81,17 +80,12 @@ void display_inetconf(void)
        }
        ic_misc = strdup("");
 
-       output_headers(3);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Internet configuration</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-
        serv_printf("CONF GETSYS|application/x-citadel-internet-config");
-       serv_gets(buf);
-       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
-               extract(ename, buf, 0);
-               extract(etype, buf, 1);
+               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])) {
@@ -112,33 +106,50 @@ void display_inetconf(void)
 
        }
 
-       wprintf("<TABLE border=0 width=100%%>\n");
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Internet configuration</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"content\">\n");
+
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%%><tr><td valign=top>\n");
        for (which=0; which<ic_max; ++which) {
-               if (which % 2 == 0) {
-                       wprintf("<TR>");
+               if (which == (ic_max / 2)) {
+                       wprintf("</TD><TD VALIGN=TOP>");
                }
-               wprintf("<TD>");
                svprintf("BOXTITLE", WCS_STRING, ic_boxtitle[which]);
                do_template("beginbox");
                wprintf("<span class=\"menudesc\">");
                escputs(ic_desc[which]);
-               wprintf("</span><br>");
+               wprintf("</span><br />");
+               wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
                if (strlen(ic_spec[which]) > 0) {
                        for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
-                               extract_token(buf, ic_spec[which], i, '\n');
+                               wprintf("<TR><TD ALIGN=LEFT>");
+                               extract_token(buf, ic_spec[which], i, '\n', sizeof buf);
+                               escputs(buf);
+                               wprintf("</TD><TD ALIGN=RIGHT>"
+                                       "<A HREF=\"/save_inetconf?oper=delete&ename=");
                                escputs(buf);
-                               wprintf("<BR>\n");
+                               wprintf("&etype=%s\" ", ic_keyword[which]);
+                               wprintf("onClick=\"return confirm('Delete ");
+                               jsescputs(buf);
+                               wprintf("?');\">");
+                               wprintf("<font size=-1>(Delete)</font></a></TD></TR>\n");
                        }
                }
-               wprintf("<div align=right>(add)</div>\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");
                do_template("endbox");
-               wprintf("</TD>");
-               if (which % 2 != 0) {
-                       wprintf("</TR>");
-               }
        }
-       wprintf("</TABLE>\n");
-
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 
        for (i=0; i<ic_max; ++i) {
@@ -149,8 +160,52 @@ void display_inetconf(void)
 
 
 void save_inetconf(void) {
+       char *buf;
+       char *ename;
+       char *etype;
+       char *newconfig;
 
-       strcpy(WC->ImportantMessage, "FIXME did we do anything?");
+       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 (strlen(buf) == 0) {
+                       /* skip blank lines */
+               }
+               else if ((!strcasecmp(ename, bstr("ename")))
+                  &&   (!strcasecmp(etype, bstr("etype")))
+                  &&   (!strcasecmp(bstr("oper"), "delete"))
+               ) {
+                       sprintf(WC->ImportantMessage, "%s deleted.", ename);
+               }
+               else {
+                       if (strlen(newconfig) > 0) 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);
 }