* Completed the add/change/delete neighbor node screens

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e616073de9c955a4c8ed16c587f26dc8f199d6c7..215586e14fd2f67c4a63c37bdcda33efb21639b5 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 301.11  2001/11/22 05:17:06  ajc
+* Completed the add/change/delete neighbor node screens
+
 Revision 301.10  2001/11/18 01:47:24  ajc
 * Tentatively begun the change of networking configuration screens to reflect
   the new network architecture of the server.
@@ -640,4 +643,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/netconf.c b/webcit/netconf.c
index 5c3553acee6996129c4e917ed06499b05afcb66e..ea1647bdea8a8266128687ff2c61ca962ae31427 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -34,9 +34,43 @@ struct sharelist {
 
 
 void edit_node(void) {
-
-       if (strcmp(bstr("sc"), "OK")) {
-               /* FIXME do something */
+       char buf[SIZ];
+       char node[SIZ];
+       char cnode[SIZ];
+       FILE *fp;
+
+       if (!strcmp(bstr("sc"), "OK")) {
+               strcpy(node, bstr("node") );
+               fp = tmpfile();
+               if (fp != NULL) {
+                       serv_puts("CONF getsys|application/x-citadel-ignet-config");
+                       serv_gets(buf);
+                       if (buf[0] == '1') {
+                               while (serv_gets(buf), strcmp(buf, "000")) {
+                                       extract(cnode, buf, 0);
+                                       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') {
+                               while (fgets(buf, sizeof buf, fp) != NULL) {
+                                       buf[strlen(buf)-1] = 0;
+                                       serv_puts(buf);
+                               }
+                               serv_puts("000");
+                       }
+                       fclose(fp);
+               }
        }
 
        display_netconf();
@@ -44,6 +78,32 @@ void edit_node(void) {
 
 
 
+void display_add_node(void)
+{
+       output_headers(1);
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
+       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+       wprintf("<B>Add new node</B>");
+       wprintf("</FONT></TD></TR></TABLE>\n");
+
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
+       wprintf("<CENTER><TABLE border=0>\n");
+       wprintf("<TR><TD>Node name</TD>");
+       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"8\"></TD></TR>\n");
+       wprintf("<TR><TD>Shared secret</TD>");
+       wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"8\"></TD></TR>\n");
+       wprintf("<TR><TD>Host or IP</TD>");
+       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"32\"></TD></TR>\n");
+       wprintf("<TR><TD>Port</TD>");
+       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" MAXLENGTH=\"8\"></TD></TR>\n");
+       wprintf("</TABLE><BR>");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+       wprintf("</CENTER></FORM>\n");
+
+       wDumpContent(1);
+}
+
 void display_edit_node(void)
 {
        char buf[SIZ];
@@ -168,48 +228,42 @@ void display_confirm_delete_node(void)
 
 void delete_node(void)
 {
-       char node[SIZ];
        char buf[SIZ];
+       char node[SIZ];
+       char cnode[SIZ];
+       FILE *fp;
 
-       strcpy(node, bstr("node"));
-       sprintf(buf, "NSET deletenode|%s", node);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0] == '1') {
-               output_headers(1);
-               server_to_text();
-               wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
-               wDumpContent(1);
-       } else {
-               display_error(&buf[4]);
-       }
-}
-
-
-void display_add_node(void)
-{
-
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Add a new node</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/add_node\">\n");
-
-       wprintf("Enter name of new node: ");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"64\"><BR>\n");
+       strcpy(node, bstr("node") );
+       fp = tmpfile();
+       if (fp != NULL) {
+               serv_puts("CONF getsys|application/x-citadel-ignet-config");
+               serv_gets(buf);
+               if (buf[0] == '1') {
+                       while (serv_gets(buf), strcmp(buf, "000")) {
+                               extract(cnode, buf, 0);
+                               if (strcasecmp(node, cnode)) {
+                                       fprintf(fp, "%s\n", buf);
+                               }
+                       }
+               }
+               rewind(fp);
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Add\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+               serv_puts("CONF putsys|application/x-citadel-ignet-config");
+               serv_gets(buf);
+               if (buf[0] == '4') {
+                       while (fgets(buf, sizeof buf, fp) != NULL) {
+                               buf[strlen(buf)-1] = 0;
+                               serv_puts(buf);
+                       }
+                       serv_puts("000");
+               }
+               fclose(fp);
+       }
 
-       wprintf("</FORM></CENTER>\n");
-       wDumpContent(1);
+       display_netconf();
 }
 
 
-
 void add_node(void)
 {
        char node[SIZ];