* more work on netconf

diff --git a/webcit/netconf.c b/webcit/netconf.c
index 2f77d73e01a5e4ae250b7717b0723e468b78cb9d..5c3553acee6996129c4e917ed06499b05afcb66e 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -33,48 +33,69 @@ struct sharelist {
 };
 
 
+void edit_node(void) {
+
+       if (strcmp(bstr("sc"), "OK")) {
+               /* FIXME do something */
+       }
+
+       display_netconf();
+}
+
+
+
 void display_edit_node(void)
 {
        char buf[SIZ];
        char node[SIZ];
-       char sroom[SIZ];
+       char cnode[SIZ];
+       char csecret[SIZ];
+       char chost[SIZ];
+       char cport[SIZ];
 
        strcpy(node, bstr("node"));
 
        output_headers(1);
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Edit share list for ");
+       wprintf("<B>Edit node configuration for ");
        escputs(node);
        wprintf("</B>\n");
        wprintf("</FONT></TD></TR></TABLE>\n");
 
-       wprintf("<CENTER>\n");
-       wprintf("<A HREF=\"/display_share&node=");
-       urlescputs(node);
-       wprintf("\">Add a shared room</A><BR>\n");
-
-       wprintf("<A HREF=\"/display_netconf");
-       wprintf("\">Return to network configuration screen</A><BR>\n");
-
-       serv_printf("NSET roomlist|%s", node);
+       serv_puts("CONF getsys|application/x-citadel-ignet-config");
        serv_gets(buf);
        if (buf[0] == '1') {
-               wprintf("<TABLE border=0>\n");
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(sroom, buf, 0);
-                       wprintf("<TR><TD><FONT SIZE=+1>");
-                       escputs(sroom);
-                       wprintf("</FONT></TD>");
-                       wprintf("<TD><A HREF=\"/display_confirm_unshare&sroom=");
-                       urlescputs(sroom);
-                       wprintf("&node=");
-                       urlescputs(node);
-                       wprintf("\">(UnShare)</A></TD>");
-                       wprintf("</TR>\n");
+                       extract(cnode, buf, 0);
+                       extract(csecret, buf, 1);
+                       extract(chost, buf, 2);
+                       extract(cport, buf, 3);
+
+                       if (!strcasecmp(node, cnode)) {
+                               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\" VALUE=\"%s\"></TD></TR>\n", cnode);
+                               wprintf("<TR><TD>Shared secret</TD>");
+                               wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"8\" VALUE=\"%s\"></TD></TR>\n", csecret);
+                               wprintf("<TR><TD>Host or IP</TD>");
+                               wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"32\" VALUE=\"%s\"></TD></TR>\n", chost);
+                               wprintf("<TR><TD>Port</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=\"sc\" VALUE=\"Cancel\">");
+                               wprintf("</CENTER></FORM>\n");
+                       }
+
                }
-               wprintf("</TABLE></CENTER>\n");
        }
+
+       else {          /* command error getting configuration */
+               wprintf("%s<BR>\n", &buf[4]);
+       }
+
        wDumpContent(1);
 }
 
@@ -123,34 +144,6 @@ void display_netconf(void)
 }
 
 
-void display_confirm_unshare(void)
-{
-       char node[SIZ];
-       char sroom[SIZ];
-
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm unshare</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       strcpy(node, bstr("node"));
-       strcpy(sroom, bstr("sroom"));
-       wprintf("<CENTER>Are you sure you want to unshare <FONT SIZE=+1>");
-       escputs(sroom);
-       wprintf("</FONT>?<BR>\n");
-       wprintf("<A HREF=\"/unshare&node=");
-       urlescputs(node);
-       wprintf("&sroom=");
-       urlescputs(sroom);
-       wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
-       wprintf("<A HREF=\"/display_edit_node&node=");
-       urlescputs(node);
-       wprintf("\">No</A><BR>\n");
-       wDumpContent(1);
-}
-
-
 void display_confirm_delete_node(void)
 {
        char node[SIZ];
@@ -193,29 +186,6 @@ void delete_node(void)
 }
 
 
-void unshare(void)
-{
-       char node[SIZ];
-       char sroom[SIZ];
-       char buf[SIZ];
-
-       strcpy(node, bstr("node"));
-       strcpy(sroom, bstr("sroom"));
-       sprintf(buf, "NSET unshare|%s|%s", node, sroom);
-       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)
 {
 
@@ -265,104 +235,3 @@ void add_node(void)
 }
 
 
-
-void display_share(void)
-{
-       char buf[SIZ];
-       char node[SIZ];
-       char sroom[SIZ];
-       struct sharelist *shlist = NULL;
-       struct sharelist *shptr;
-       int already_shared;
-
-       strcpy(node, bstr("node"));
-
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Add a shared room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/share\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"node\" VALUE=\"");
-       urlescputs(node);
-       wprintf("\">\n");
-
-       sprintf(buf, "NSET roomlist|%s", node);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0] == '1') {
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       shptr = (struct sharelist *)
-                           malloc(sizeof(struct sharelist));
-                       shptr->next = shlist;
-                       extract(shptr->shname, buf, 0);
-                       shlist = shptr;
-               }
-       }
-       wprintf("<SELECT NAME=\"sroom\" SIZE=5 WIDTH=30>\n");
-       serv_puts("LKRA");
-       serv_gets(buf);
-       if (buf[0] == '1') {
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(sroom, buf, 0);
-                       already_shared = 0;
-                       for (shptr = shlist; shptr != NULL; shptr = shptr->next) {
-                               if (!strcasecmp(sroom, shptr->shname))
-                                       already_shared = 1;
-                       }
-
-                       if (already_shared == 0) {
-                               wprintf("<OPTION>");
-                               escputs(sroom);
-                               wprintf("\n");
-                       }
-               }
-       }
-       wprintf("</SELECT>\n");
-       wprintf("<BR>\n");
-
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Share\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-
-       wprintf("</FORM></CENTER>\n");
-       wDumpContent(1);
-
-       /* free the list */
-       while (shlist != NULL) {
-               shptr = shlist->next;
-               free(shlist);
-               shlist = shptr;
-       }
-
-}
-
-
-
-void share(void)
-{
-       char node[SIZ];
-       char buf[SIZ];
-       char sc[SIZ];
-       char sroom[SIZ];
-
-       strcpy(node, bstr("node"));
-       strcpy(sc, bstr("sc"));
-       strcpy(sroom, bstr("sroom"));
-
-       if (!strcmp(sc, "Share")) {
-               sprintf(buf, "NSET share|%s|%s", node, sroom);
-               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]);
-               }
-
-       }
-}

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 6e884e88a8002e7469c67778bf9c6a45db982a00..b4327cbb0f89043d8cc8ebf0b87bde8ebaf22de3 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -938,24 +938,18 @@ void session_loop(struct httprequest *req)
                changepw();
        } else if (!strcasecmp(action, "display_edit_node")) {
                display_edit_node();
+       } else if (!strcasecmp(action, "edit_node")) {
+               edit_node();
        } else if (!strcasecmp(action, "display_netconf")) {
                display_netconf();
-       } else if (!strcasecmp(action, "display_confirm_unshare")) {
-               display_confirm_unshare();
        } else if (!strcasecmp(action, "display_confirm_delete_node")) {
                display_confirm_delete_node();
        } else if (!strcasecmp(action, "delete_node")) {
                delete_node();
-       } else if (!strcasecmp(action, "unshare")) {
-               unshare();
        } else if (!strcasecmp(action, "display_add_node")) {
                display_add_node();
        } else if (!strcasecmp(action, "add_node")) {
                add_node();
-       } else if (!strcasecmp(action, "display_share")) {
-               display_share();
-       } else if (!strcasecmp(action, "share")) {
-               share();
        } else if (!strcasecmp(action, "terminate_session")) {
                slrp_highest();
                terminate_session();

diff --git a/webcit/webcit.h b/webcit/webcit.h
index b0e25f4f8beec63dded2fa941b6dbdafaed3da4d..499f05850f7ae9881b61248bf5702be00d183b38 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -252,15 +252,12 @@ void register_user(void);
 void display_changepw(void);
 void changepw(void);
 void display_edit_node(void);
+void edit_node(void);
 void display_netconf(void);
-void display_confirm_unshare(void);
 void display_confirm_delete_node(void);
 void delete_node(void);
-void unshare(void);
 void display_add_node(void);
 void add_node(void);
-void display_share(void);
-void share(void);
 void terminate_session(void);
 void edit_me(void);
 void display_siteconfig(void);