* Moved to the new string tokenizer API

[citadel.git] / webcit / netconf.c

diff --git a/webcit/netconf.c b/webcit/netconf.c
index 29274d6228da40926ff24690b903a62dc50b13c0..6886446ec90da2211fdffc70bedb9a5308a64e85 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -1,9 +1,8 @@
 /* 
- * netconf.c
+ * $Id$
  *
  * Functions which handle network and sharing configuration.
  *
- * $Id$
  */
 
 #include <ctype.h>
@@ -43,7 +42,7 @@ void edit_node(void) {
                        serv_gets(buf);
                        if (buf[0] == '1') {
                                while (serv_gets(buf), strcmp(buf, "000")) {
-                                       extract(cnode, buf, 0);
+                                       extract_token(cnode, buf, 0, '|', sizeof cnode);
                                        if (strcasecmp(node, cnode)) {
                                                fprintf(fp, "%s\n", buf);
                                        }
@@ -81,7 +80,7 @@ void display_add_node(void)
        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><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
        wprintf("<CENTER><TABLE border=0>\n");
@@ -120,16 +119,16 @@ void display_edit_node(void)
        escputs(node);
        wprintf("</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        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);
-                       extract(csecret, buf, 1);
-                       extract(chost, buf, 2);
-                       extract(cport, buf, 3);
+                       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");
@@ -171,7 +170,7 @@ void display_netconf(void)
        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><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        wprintf("<CENTER>");
        wprintf("<A HREF=\"/display_add_node\">");
@@ -186,7 +185,7 @@ void display_netconf(void)
        if (buf[0] == '1') {
                wprintf("<CENTER><TABLE border=0>\n");
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(node, buf, 0);
+                       extract_token(node, buf, 0, '|', sizeof node);
                        wprintf("<TR><TD><FONT SIZE=+1>");
                        escputs(node);
                        wprintf("</FONT></TD>");
@@ -213,7 +212,7 @@ void display_confirm_delete_node(void)
        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><div id=\"text\">\n");
+       wprintf("</div>\n<div id=\"content\">\n");
 
        strcpy(node, bstr("node"));
        wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");
@@ -241,7 +240,7 @@ void delete_node(void)
                serv_gets(buf);
                if (buf[0] == '1') {
                        while (serv_gets(buf), strcmp(buf, "000")) {
-                               extract(cnode, buf, 0);
+                               extract_token(cnode, buf, 0, '|', sizeof cnode);
                                if (strcasecmp(node, cnode)) {
                                        fprintf(fp, "%s\n", buf);
                                }