X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsetup_wizard.c;h=6ad0cc2e96a80dbc9ba078f1b3d97985ab440736;hb=f5c1330914acc193f96892efc191a32ee537dfb5;hp=464576c532b6914503b7dfae4f94bbc966ea6801;hpb=e0d3eae9dc5eb2c07bd8cf89bba016b7dc52c08f;p=citadel.git

diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 464576c53..6ad0cc2e9 100644
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -1,33 +1,9 @@
 /*
- * $Id$
- *
  * First-time setup wizard
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-
-/*
- */
 void do_setup_wizard(void)
 {
 	char *step;
@@ -38,38 +14,42 @@ 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();
 		return;
 	}
 
-	output_headers(1, 1, 2, 0, 1, 0, 0);
+	output_headers(1, 1, 2, 0, 0, 0);
+
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/citadel-logo.gif\" WIDTH=64 HEIGHT=64");
+	wc_printf("<h1>&nbsp;First time setup</h1>");
+	wc_printf("</div>\n");
 
-	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");
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	wprintf("<div id=\"fix_scrollbar_bug\">"
-		"<form method=\"post\" action=\"/setup_wizard\">\n"
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<form method=\"post\" action=\"setup_wizard\">\n"
 	);
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf("<div align=center>"
+	wc_printf("<div align=center>"
 		"This is where the setup wizard will be placed.<br>\n"
 		"For now, just click Finish.<br><br>\n"
 	);
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Next\">\n");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Finish\">\n");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Next\">\n");
+	wc_printf("<INPUT TYPE=\"submit\" NAME=\"step\" VALUE=\"Finish\">\n");
 
-	wprintf("</form></div></div>\n");
+	wc_printf("</form></div></div>\n");
 	wDumpContent(1);
 }
 
-
+void 
+InitModule_SETUP_WIZARD
+(void)
+{
+	WebcitAddUrlHandler(HKEY("setup_wizard"), "", 0, do_setup_wizard, 0);
+}