* Created IsEmptyStr define to be used rather then using some weird strlen constructs

[citadel.git] / webcit / netconf.c

diff --git a/webcit/netconf.c b/webcit/netconf.c
index f3802961a5db6f20d661ea31e279e890f41069fe..bfb9388708df9a24f15290e24daff3974ed741e6 100644 (file)
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -18,7 +18,7 @@ void edit_node(void) {
        char cnode[SIZ];
        FILE *fp;
 
-       if (strlen(bstr("ok_button")) > 0) {
+       if (!IsEmptyStr(bstr("ok_button"))) {
                strcpy(node, bstr("node") );
                fp = tmpfile();
                if (fp != NULL) {
@@ -63,7 +63,7 @@ void display_add_node(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Add a new node"));
        wprintf("</SPAN>");
@@ -71,6 +71,7 @@ void display_add_node(void)
        wprintf("</div>\n<div id=\"content\">\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>%s</TD>", _("Node name"));
        wprintf("<TD><INPUT TYPE=\"text\" NAME=\"node\" MAXLENGTH=\"16\"></TD></TR>\n");
@@ -105,7 +106,7 @@ void display_edit_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Edit node configuration for "));
        escputs(node);
@@ -124,6 +125,7 @@ void display_edit_node(void)
 
                        if (!strcasecmp(node, cnode)) {
                                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>");
                                wprintf(_("Node name"));
@@ -171,7 +173,7 @@ void display_netconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Network configuration"));
        wprintf("</SPAN>\n");
@@ -184,7 +186,7 @@ void display_netconf(void)
        wprintf("</A><br />\n");
        wprintf("</CENTER>");
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Currently configured nodes"));
        wprintf("</SPAN>\n");
@@ -224,7 +226,7 @@ void display_confirm_delete_node(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+       wprintf("<TABLE class=\"netconf_banner\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Confirm delete"));
        wprintf("</SPAN>\n");
@@ -298,7 +300,7 @@ void add_node(void)
 
        strcpy(node, bstr("node"));
 
-       if (strlen(bstr("add_button")) > 0)  {
+       if (!IsEmptyStr(bstr("add_button")))  {
                sprintf(buf, "NSET addnode|%s", node);
                serv_puts(buf);
                serv_getln(buf, sizeof buf);