* fix_scrollbar_bug is now a class instead of an id. Fixes validator warnings.
[citadel.git] / webcit / inetconf.c
index 091592f2fd88e5908eb02dbfbedd132db1877933..eaee1b717085a98134a0c69a4a044a75eaab7f6a 100644 (file)
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
@@ -47,33 +28,30 @@ void display_inetconf(void)
        };
        char *ic_spec[ic_max];
        char *ic_misc;
-
-       char *ic_keyword[] = {
-               "localhost",
-               "directory",
-               "gatewaydomain",
-               "smarthost",
-               "rbl",
-               "spamassassin",
-       };
-
-       char *ic_boxtitle[] = {
-               "Local host aliases",
-               "Directory domains",
-               "Gateway domains",
-               "Smart hosts",
-               "RBL hosts",
-               "SpamAssassin hosts",
-       };
-
-       char *ic_desc[] = {
-               "(domains for which this host receives mail)",
-               "(domains mapped with the Global Address Book)",
-               "(domains whose subdomains match Citadel hosts)",
-               "(if present, forward all outbound mail to one of these hosts)",
-               "(hosts running a Realtime Blackhole List)",
-               "(hosts running the SpamAssassin service)",
-       };
+       char *ic_keyword[ic_max];
+       char *ic_boxtitle[ic_max];
+       char *ic_desc[ic_max];
+
+       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_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_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)");
 
        for (i=0; i<ic_max; ++i) {
                ic_spec[i] = strdup("");
@@ -81,11 +59,11 @@ void display_inetconf(void)
        ic_misc = strdup("");
 
        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])) {
@@ -106,14 +84,16 @@ void display_inetconf(void)
 
        }
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 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("<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Internet configuration"));
+       wprintf("</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<div style=\"margin-right:1px\">"
+       wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr><td valign=top>\n");
        for (which=0; which<ic_max; ++which) {
                if (which == (ic_max / 2)) {
@@ -128,19 +108,20 @@ void display_inetconf(void)
                if (strlen(ic_spec[which]) > 0) {
                        for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
                                wprintf("<TR><TD ALIGN=LEFT>");
-                               extract_token(buf, ic_spec[which], i, '\n');
+                               extract_token(buf, ic_spec[which], i, '\n', sizeof buf);
                                escputs(buf);
                                wprintf("</TD><TD ALIGN=RIGHT>"
-                                       "<A HREF=\"/save_inetconf?oper=delete&ename=");
+                                       "<a href=\"save_inetconf?oper=delete&ename=");
                                escputs(buf);
                                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("onClick=\"return confirm('%s');\">",
+                                       _("Delete this entry?"));
+                               wprintf("<font size=-1>");
+                               wprintf(_("(Delete)"));
+                               wprintf("</font></a></TD></TR>\n");
                        }
                }
-               wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_inetconf\">\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]);
@@ -172,10 +153,10 @@ void save_inetconf(void) {
 
        strcpy(newconfig, "");
        serv_printf("CONF GETSYS|application/x-citadel-internet-config");
-       serv_gets(buf);
-       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
-               extract(ename, buf, 0);
-               extract(etype, buf, 1);
+       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 */
                }
@@ -183,7 +164,7 @@ void save_inetconf(void) {
                   &&   (!strcasecmp(etype, bstr("etype")))
                   &&   (!strcasecmp(bstr("oper"), "delete"))
                ) {
-                       sprintf(WC->ImportantMessage, "%s deleted.", ename);
+                       sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
                }
                else {
                        if (strlen(newconfig) > 0) strcat(newconfig, "\n");
@@ -192,7 +173,7 @@ void save_inetconf(void) {
        }
 
        serv_printf("CONF PUTSYS|application/x-citadel-internet-config");
-       serv_gets(buf);
+       serv_getln(buf, SIZ);
        if (buf[0] == '4') {
                serv_puts(newconfig);
                if (!strcasecmp(bstr("oper"), "add")) {