* we have now several bstrs:
[citadel.git] / webcit / netconf.c
index 0c16ebc5954efbd207d75e86f9b41ac144409a8d..ee7c5a91fd7f4bf4e30dbe568453873f71c99fa8 100644 (file)
@@ -1,70 +1,58 @@
 /* 
  * $Id$
+ */
+/**
+ * \defgroup NetShareConf Functions which handle network and sharing configuration.
  *
- * Functions which handle network and sharing configuration.
- *
+ * \ingroup CitadelConfig
  */
-
-#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"
 
-
-
+/**
+ * \brief edit a network node
+ */
 void edit_node(void) {
        char buf[SIZ];
        char node[SIZ];
        char cnode[SIZ];
        FILE *fp;
 
-       if (!strcmp(bstr("sc"), "OK")) {
+       if (havebstr("ok_button")) {
                strcpy(node, bstr("node") );
                fp = tmpfile();
                if (fp != NULL) {
                        serv_puts("CONF getsys|application/x-citadel-ignet-config");
-                       serv_gets(buf);
+                       serv_getln(buf, sizeof buf);
                        if (buf[0] == '1') {
-                               while (serv_gets(buf), strcmp(buf, "000")) {
-                                       extract(cnode, buf, 0);
+                               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                                       extract_token(cnode, buf, 0, '|', sizeof cnode);
                                        if (strcasecmp(node, cnode)) {
                                                fprintf(fp, "%s\n", buf);
                                        }
                                }
-                       fprintf(fp, "%s|%s|%s|%s\n", 
-                               bstr("node"),
-                               bstr("secret"),
-                               bstr("host"),
-                               bstr("port") );
-                       }
                        rewind(fp);
+               }
 
-                       serv_puts("CONF putsys|application/x-citadel-ignet-config");
-                       serv_gets(buf);
-                       if (buf[0] == '4') {
+               serv_puts("CONF putsys|application/x-citadel-ignet-config");
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '4') {
+                       if (fp != NULL) {
                                while (fgets(buf, sizeof buf, fp) != NULL) {
                                        buf[strlen(buf)-1] = 0;
-                                       serv_puts(buf);
+                                       if (buf[0] != 0) {
+                                               serv_puts(buf);
+                                       }
                                }
-                               serv_puts("000");
+                               fclose(fp);
                        }
-                       fclose(fp);
+                       serv_printf("%s|%s|%s|%s", 
+                               bstr("node"),
+                               bstr("secret"),
+                               bstr("host"),
+                               bstr("port") );
+                       }
+                       serv_puts("000");
                }
        }
 
@@ -72,86 +60,106 @@ void edit_node(void) {
 }
 
 
-
+/**
+ * \brief add a node
+ */
 void display_add_node(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\">Add new node</SPAN>");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("<h1>");
+       wprintf(_("Add a new node"));
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
+       wprintf("<FORM METHOD=\"POST\" action=\"edit_node\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        wprintf("<CENTER><TABLE border=0>\n");
-       wprintf("<TR><TD>Node name</TD>");
+       wprintf("<TR><TD>%s</TD>", _("Node name"));
        wprintf("<TD><INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"16\"></TD></TR>\n");
-       wprintf("<TR><TD>Shared secret</TD>");
+       wprintf("<TR><TD>%s</TD>", _("Shared secret"));
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"16\"></TD></TR>\n");
-       wprintf("<TR><TD>Host or IP</TD>");
+       wprintf("<TR><TD>%s</TD>", _("Host or IP address"));
        wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"64\"></TD></TR>\n");
-       wprintf("<TR><TD>Port</TD>");
-       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" MAXLENGTH=\"8\"></TD></TR>\n");
+       wprintf("<TR><TD>%s</TD>", _("Port number"));
+       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" VALUE=\"504\" MAXLENGTH=\"8\"></TD></TR>\n");
        wprintf("</TABLE><br />");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Add node"));
        wprintf("&nbsp;");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
        wprintf("</CENTER></FORM>\n");
 
        wDumpContent(1);
 }
 
+/**
+ * \brief modify an existing node
+ */
 void display_edit_node(void)
 {
-       char buf[SIZ];
-       char node[SIZ];
-       char cnode[SIZ];
-       char csecret[SIZ];
-       char chost[SIZ];
-       char cport[SIZ];
+       char buf[512];
+       char node[256];
+       char cnode[256];
+       char csecret[256];
+       char chost[256];
+       char cport[256];
 
        strcpy(node, bstr("node"));
 
-       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\">Edit node configuration for ");
+       wprintf("<h1>");
+       wprintf(_("Edit node configuration for "));
        escputs(node);
-       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");
 
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(cnode, buf, 0);
-                       extract(csecret, buf, 1);
-                       extract(chost, buf, 2);
-                       extract(cport, buf, 3);
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cnode, buf, 0, '|', sizeof cnode);
+                       extract_token(csecret, buf, 1, '|', sizeof csecret);
+                       extract_token(chost, buf, 2, '|', sizeof chost);
+                       extract_token(cport, buf, 3, '|', sizeof cport);
 
                        if (!strcasecmp(node, cnode)) {
-                               wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
+                               wprintf("<FORM METHOD=\"POST\" action=\"edit_node\">\n");
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
                                wprintf("<CENTER><TABLE border=0>\n");
-                               wprintf("<TR><TD>Node name</TD>");
+                               wprintf("<TR><TD>");
+                               wprintf(_("Node name"));
+                               wprintf("</TD>");
                                wprintf("<TD><INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"16\" VALUE=\"%s\"></TD></TR>\n", cnode);
-                               wprintf("<TR><TD>Shared secret</TD>");
+                               wprintf("<TR><TD>");
+                               wprintf(_("Shared secret"));
+                               wprintf("</TD>");
                                wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"16\" VALUE=\"%s\"></TD></TR>\n", csecret);
-                               wprintf("<TR><TD>Host or IP</TD>");
+                               wprintf("<TR><TD>");
+                               wprintf(_("Host or IP address"));
+                               wprintf("</TD>");
                                wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"64\" VALUE=\"%s\"></TD></TR>\n", chost);
-                               wprintf("<TR><TD>Port</TD>");
+                               wprintf("<TR><TD>");
+                               wprintf(_("Port number"));
+                               wprintf("</TD>");
                                wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" MAXLENGTH=\"8\" VALUE=\"%s\"></TD></TR>\n", cport);
                                wprintf("</TABLE><br />");
-                               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+                               wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">",
+                                       _("Save changes"));
                                wprintf("&nbsp;");
-                               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+                               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
+                                       _("Cancel"));
                                wprintf("</CENTER></FORM>\n");
                        }
 
                }
        }
 
-       else {          /* command error getting configuration */
+       else {          /** command error getting configuration */
                wprintf("%s<br />\n", &buf[4]);
        }
 
@@ -159,42 +167,53 @@ void display_edit_node(void)
 }
 
 
-
+/**
+ * \brief display all configured nodes
+ */
 void display_netconf(void)
 {
        char buf[SIZ];
        char node[SIZ];
 
-       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\">Network configuration</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("<h1>");
+       wprintf(_("Network configuration"));
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<CENTER>");
-       wprintf("<A HREF=\"/display_add_node\">");
-       wprintf("Add a new node</A><br />\n");
+       wprintf("<a href=\"display_add_node\">");
+       wprintf(_("Add a new node"));
+       wprintf("</A><br />\n");
        wprintf("</CENTER>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Currently configured nodes</SPAN>\n");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Currently configured nodes"));
+       wprintf("</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
        serv_puts("CONF getsys|application/x-citadel-ignet-config");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
                wprintf("<CENTER><TABLE border=0>\n");
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(node, buf, 0);
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(node, buf, 0, '|', sizeof node);
                        wprintf("<TR><TD><FONT SIZE=+1>");
                        escputs(node);
                        wprintf("</FONT></TD>");
-                       wprintf("<TD><A HREF=\"/display_edit_node&node=");
+                       wprintf("<TD><a href=\"display_edit_node&node=");
                        urlescputs(node);
-                       wprintf("\">(Edit)</A></TD>");
-                       wprintf("<TD><A HREF=\"/display_confirm_delete_node&node=");
+                       wprintf("\">");
+                       wprintf(_("(Edit)"));
+                       wprintf("</A></TD>");
+                       wprintf("<TD><a href=\"display_confirm_delete_node&node=");
                        urlescputs(node);
-                       wprintf("\">(Delete)</A></TD>");
+                       wprintf("\">");
+                       wprintf(_("(Delete)"));
+                       wprintf("</A></TD>");
                        wprintf("</TR>\n");
                }
                wprintf("</TABLE></CENTER>\n");
@@ -202,30 +221,42 @@ void display_netconf(void)
        wDumpContent(1);
 }
 
-
+/**
+ * \brief display the dialog to verify the deletion
+ */
 void display_confirm_delete_node(void)
 {
        char node[SIZ];
 
-       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\">Confirm delete</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("<h1>");
+       wprintf(_("Confirm delete"));
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\" >\n");
 
        strcpy(node, bstr("node"));
-       wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");
+       wprintf("<CENTER>");
+       wprintf(_("Are you sure you want to delete "));
+       wprintf("<FONT SIZE=+1>");
        escputs(node);
        wprintf("</FONT>?<br />\n");
-       wprintf("<A HREF=\"/delete_node&node=");
+       wprintf("<a href=\"delete_node&node=");
        urlescputs(node);
-       wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
-       wprintf("<A HREF=\"/display_netconf\">No</A><br />\n");
+       wprintf("\">");
+       wprintf(_("Yes"));
+       wprintf("</A>&nbsp;&nbsp;&nbsp;");
+       wprintf("<a href=\"display_netconf\">");
+       wprintf(_("No"));
+       wprintf("</A><br />\n");
        wDumpContent(1);
 }
 
-
+/**
+ * \brief actually delete the node
+ */
 void delete_node(void)
 {
        char buf[SIZ];
@@ -237,10 +268,10 @@ void delete_node(void)
        fp = tmpfile();
        if (fp != NULL) {
                serv_puts("CONF getsys|application/x-citadel-ignet-config");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '1') {
-                       while (serv_gets(buf), strcmp(buf, "000")) {
-                               extract(cnode, buf, 0);
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               extract_token(cnode, buf, 0, '|', sizeof cnode);
                                if (strcasecmp(node, cnode)) {
                                        fprintf(fp, "%s\n", buf);
                                }
@@ -249,7 +280,7 @@ void delete_node(void)
                rewind(fp);
 
                serv_puts("CONF putsys|application/x-citadel-ignet-config");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '4') {
                        while (fgets(buf, sizeof buf, fp) != NULL) {
                                buf[strlen(buf)-1] = 0;
@@ -264,29 +295,4 @@ void delete_node(void)
 }
 
 
-void add_node(void)
-{
-       char node[SIZ];
-       char buf[SIZ];
-       char sc[SIZ];
-
-       strcpy(node, bstr("node"));
-       strcpy(sc, bstr("sc"));
-
-       if (!strcmp(sc, "Add")) {
-               sprintf(buf, "NSET addnode|%s", node);
-               serv_puts(buf);
-               serv_gets(buf);
-               if (buf[0] == '1') {
-                       output_headers(1, 1, 0, 0, 0, 0, 0);
-                       server_to_text();
-                       wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-                       wDumpContent(1);
-               } else {
-                       strcpy(WC->ImportantMessage, &buf[4]);
-                       display_netconf();
-               }
-       }
-}
-
-
+/*@}*/