* --pedantic cleanup.
[citadel.git] / webcit / netconf.c
index bd48e76315cc3263d919493a74d277381ad16fee..d95c6ea5e15fdbd252702553748d079c075571d6 100644 (file)
@@ -168,12 +168,7 @@ void edit_node(void) {
        HashList *NodeConfig;
        const StrBuf *Index;
        NodeConf *NewNode;
-/*
-       char buf[SIZ];
-       char node[SIZ];
-       char cnode[SIZ];
-       FILE *fp;
-*/
+
        if (havebstr("ok_button")) {
                Index = sbstr("index");
                NewNode = HttpGetNewNode();
@@ -187,85 +182,11 @@ void edit_node(void) {
                Put(NodeConfig, ChrPtr(Index), StrLength(Index), NewNode, DeleteNodeConf);
                save_net_conf(NodeConfig);
                DeleteHash(&NodeConfig);
-/*
-               strcpy(node, bstr("node") );
-               fp = tmpfile();
-               if (fp != NULL) {
-                       serv_puts("CONF getsys|application/x-citadel-ignet-config");
-                       serv_getln(buf, sizeof buf);
-                       if (buf[0] == '1') {
-                               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);
-                                       }
-                               }
-                       rewind(fp);
-               }
-
-               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;
-                                       if (buf[0] != 0) {
-                                               serv_puts(buf);
-                                       }
-                               }
-                               fclose(fp);
-                       }
-                       serv_printf("%s|%s|%s|%s", 
-                               bstr("node"),
-                               bstr("secret"),
-                               bstr("host"),
-                               bstr("port") );
-                       }
-                       serv_puts("000");
-               }
-*/
        }
-
-       //display_netconf();
        url_do_template();
 }
 
 
-/**
- * \brief add a node
- */
-void display_add_node(void)
-{/*
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\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("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wprintf("<CENTER><TABLE border=0>\n");
-       wprintf("<TR><TD>%s</TD>", _("Node name"));
-       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"16\"></TD></TR>\n");
-       wprintf("<TR><TD>%s</TD>", _("Shared secret"));
-       wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"16\"></TD></TR>\n");
-       wprintf("<TR><TD>%s</TD>", _("Host or IP address"));
-       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"64\"></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=\"ok_button\" VALUE=\"%s\">", _("Add node"));
-       wprintf("&nbsp;");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-       wprintf("</CENTER></FORM>\n");
-
-       wDumpContent(1);
- */
-}
-
 /**
  * \brief modify an existing node
  */
@@ -297,131 +218,14 @@ void display_edit_node(void)
 
        DeleteHash(&NodeConfig);
        
-/*
-       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);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<h1>");
-       wprintf(_("Edit node configuration for "));
-       escputs(node);
-       wprintf("</h1>");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       serv_puts("CONF getsys|application/x-citadel-ignet-config");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               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("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-                               wprintf("<CENTER><TABLE border=0>\n");
-                               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>");
-                               wprintf(_("Shared secret"));
-                               wprintf("</TD>");
-                               wprintf("<TD><INPUT TYPE=\"password\" NAME=\"secret\" MAXLENGTH=\"16\" VALUE=\"%s\"></TD></TR>\n", csecret);
-                               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>");
-                               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=\"ok_button\" VALUE=\"%s\">",
-                                       _("Save changes"));
-                               wprintf("&nbsp;");
-                               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
-                                       _("Cancel"));
-                               wprintf("</CENTER></FORM>\n");
-                       }
-
-               }
-       }
-
-       else {          / ** command error getting configuration * /
-               wprintf("%s<br />\n", &buf[4]);
-       }
-
-       wDumpContent(1);
-*/
 }
 
 
-
-
-//CFG:IGNET:NODE
 /**
  * \brief display all configured nodes
  */
 void display_netconf(void)
 {
-/*
-       char buf[SIZ];
-       char node[SIZ];
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\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"));
-       wprintf("</A><br />\n");
-       wprintf("</CENTER>");
-
-       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_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               wprintf("<CENTER><TABLE border=0>\n");
-               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=");
-                       urlescputs(node);
-                       wprintf("\">");
-                       wprintf(_("(Edit)"));
-                       wprintf("</A></TD>");
-                       wprintf("<TD><a href=\"display_confirm_delete_node&node=");
-                       urlescputs(node);
-                       wprintf("\">");
-                       wprintf(_("(Delete)"));
-                       wprintf("</A></TD>");
-                       wprintf("</TR>\n");
-               }
-               wprintf("</TABLE></CENTER>\n");
-       }
-*/
        wDumpContent(1);
 }
 
@@ -430,32 +234,6 @@ void display_netconf(void)
  */
 void display_confirm_delete_node(void)
 {
-/*
-       char node[SIZ];
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<h1>");
-       wprintf(_("Confirm delete"));
-       wprintf("</h1>");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\" >\n");
-
-       strcpy(node, bstr("node"));
-       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=");
-       urlescputs(node);
-       wprintf("\">");
-       wprintf(_("Yes"));
-       wprintf("</A>&nbsp;&nbsp;&nbsp;");
-       wprintf("<a href=\"display_netconf\">");
-       wprintf(_("No"));
-       wprintf("</A><br />\n");
-*/
        wDumpContent(1);
 }
 
@@ -492,41 +270,6 @@ void delete_node(void)
        
        url_do_template();
 
-/*
-       char buf[SIZ];
-       char node[SIZ];
-       char cnode[SIZ];
-       FILE *fp;
-
-       strcpy(node, bstr("node") );
-       fp = tmpfile();
-       if (fp != NULL) {
-               serv_puts("CONF getsys|application/x-citadel-ignet-config");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       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);
-                               }
-                       }
-               }
-               rewind(fp);
-
-               serv_puts("CONF putsys|application/x-citadel-ignet-config");
-               serv_getln(buf, sizeof 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();
-*/
 }
 
 void 
@@ -539,7 +282,6 @@ InitModule_NETCONF
        WebcitAddUrlHandler(HKEY("display_netconf"), display_netconf, 0);
        WebcitAddUrlHandler(HKEY("display_confirm_delete_node"), display_confirm_delete_node, 0);
        WebcitAddUrlHandler(HKEY("delete_node"), delete_node, 0);
-       WebcitAddUrlHandler(HKEY("display_add_node"), display_add_node, 0);
        RegisterIterator("NODECONFIG", 0, NULL, load_netconf, NodeCfgSubst, DeleteHash, CTX_NODECONF, CTX_NONE);
 }
 /*@}*/