* move serv_info into the session, here we can control its de/allocation the right...

[citadel.git] / webcit / setup_wizard.c

diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index bc2b2277a722261bdff60371e6dd13eb7fbfd921..a22b8fc03a2c0191031fa54c6315f71f8012d40f 100644 (file)
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -19,7 +19,7 @@ void do_setup_wizard(void)
        if (!strcasecmp(step, "Finish")) {
                fp = fopen(wizard_filename, "w");
                if (fp != NULL) {
-                       fprintf(fp, "%d\n", serv_info.serv_rev_level);
+                       fprintf(fp, "%d\n", WC->serv_info->serv_rev_level);
                        fclose(fp);
                }
                do_welcome();
@@ -29,17 +29,16 @@ void do_setup_wizard(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("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64 ALT=\" \" ALIGN=MIDDLE>");
-       wprintf("<SPAN CLASS=\"titlebar\">&nbsp;First time setup");
-       wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "<div id=\"content\">\n");
+       wprintf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64");
+       wprintf("<h1>&nbsp;First time setup</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<form method=\"post\" action=\"setup_wizard\">\n"
        );
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<div align=center>"
                "This is where the setup wizard will be placed.<br>\n"
@@ -53,4 +52,9 @@ void do_setup_wizard(void)
        wDumpContent(1);
 }
 
-
+void 
+InitModule_SETUP_WIZARD
+(void)
+{
+       WebcitAddUrlHandler(HKEY("setup_wizard"), do_setup_wizard, 0);
+}