From: Art Cancro <ajc@citadel.org>
Date: Thu, 10 Mar 2005 04:51:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v7.86~4975
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=d91f6c21ee762d93dbae1bc32360742be827e85f;p=citadel.git

*** empty log message ***
---

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 225d91817..09f5f833e 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -38,7 +38,7 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	calendar.o calendar_tools.o calendar_view.o event.o \
 	availability.o iconbar.o crypto.o inetconf.o notes.o \
 	groupdav_main.o groupdav_get.o groupdav_propfind.o \
-	groupdav_delete.o groupdav_put.o http_datestring.o \
+	groupdav_delete.o groupdav_put.o http_datestring.o setup_wizard.o \
 	$(LIBOBJS)
 	$(CC) webserver.o context_loop.o tools.o cookie_conversion.o \
 	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
@@ -48,7 +48,7 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
 	summary.o calendar.o calendar_tools.o calendar_view.o event.o \
 	availability.o ical_dezonify.o iconbar.o crypto.o inetconf.o notes.o \
 	groupdav_main.o groupdav_get.o groupdav_propfind.o groupdav_delete.o \
-	groupdav_put.o http_datestring.o \
+	groupdav_put.o http_datestring.o setup_wizard.o \
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
diff --git a/webcit/auth.c b/webcit/auth.c
index a837c275f..b7d6b64a2 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -154,15 +154,47 @@ void do_login(void)
 
 void do_welcome(void)
 {
-	char startpage[SIZ];
+	char buf[SIZ];
+	FILE *fp;
+	int i;
+
+	/*
+	 * See if we have to run the first-time setup wizard
+	 */
+	if (!setup_wizard) {
+		sprintf(wizard_filename, "setupwiz.%s.%s", ctdlhost, ctdlport);
+		for (i=0; i<strlen(wizard_filename); ++i) {
+			if (	(wizard_filename[i]==' ')
+				|| (wizard_filename[i] == '/')
+			) {
+				wizard_filename[i] = '_';
+			}
+		}
+
+		fp = fopen(wizard_filename, "r");
+		if (fp != NULL) {
+			fgets(buf, sizeof buf, fp);
+			buf[strlen(buf)-1] = 0;
+			fclose(fp);
+			if (atoi(buf) != serv_info.serv_rev_level) {
+				setup_wizard = 1;	/* already run */
+			}
+		}
+	}
 
-	get_preference("startpage", startpage);
-	if (strlen(startpage)==0) {
-		strcpy(startpage, "/dotskip&room=_BASEROOM_");
-		set_preference("startpage", startpage);
+	if (!setup_wizard) {
+		http_redirect("/setup_wizard");
 	}
 
-	http_redirect(startpage);
+	/*
+	 * Go to the user's preferred start page
+	 */
+	get_preference("startpage", buf);
+	if (strlen(buf)==0) {
+		strcpy(buf, "/dotskip&room=_BASEROOM_");
+		set_preference("startpage", buf);
+	}
+	http_redirect(buf);
 }
 
 
diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
new file mode 100644
index 000000000..47e89b8ec
--- /dev/null
+++ b/webcit/setup_wizard.c
@@ -0,0 +1,60 @@
+/*
+ * $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)
+{
+
+	output_headers(1, 1, 2, 0, 1, 0, 0);
+
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
+	wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
+	wprintf("<SPAN CLASS=\"titlebar\">&nbsp;First time setup");
+	wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
+	offer_start_page();
+	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div>\n"
+		"<div id=\"content\">\n");
+
+	wprintf("<div id=\"fix_scrollbar_bug\">");
+
+	wprintf("wow");
+
+	wprintf("</div>\n"
+		"<div align=center>"
+		"Click on a name to read user info.  Click on "
+		"<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" ALT=\"(p)\" "
+		"BORDER=0> to send "
+		"a page (instant message) to that user.</div>\n");
+	wDumpContent(1);
+}
+
+
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 9264b6309..be1c6a68f 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1354,6 +1354,8 @@ void session_loop(struct httprequest *req)
 		display_inetconf();
 	} else if (!strcasecmp(action, "save_inetconf")) {
 		save_inetconf();
+	} else if (!strcasecmp(action, "setup_wizard")) {
+		do_setup_wizard();
 	} else if (!strcasecmp(action, "diagnostics")) {
 		output_headers(1, 1, 1, 0, 0, 0, 0);
 
diff --git a/webcit/webcit.h b/webcit/webcit.h
index c7ab8d30d..779e3da5d 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -255,7 +255,9 @@ extern char *axdefs[];
 extern char *ctdlhost, *ctdlport;
 extern char *server_cookie;
 extern int is_https;
-
+extern int setup_wizard;
+extern char wizard_filename[PATH_MAX];
+void do_setup_wizard(void);
 
 void stuff_to_cookie(char *cookie, int session,
 			char *user, char *pass, char *room);
diff --git a/webcit/webserver.c b/webcit/webserver.c
index a25ea478c..70078b4c6 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -61,6 +61,8 @@ char *server_cookie = NULL;
 
 char *ctdlhost = DEFAULT_HOST;
 char *ctdlport = DEFAULT_PORT;
+int setup_wizard = 0;
+char wizard_filename[PATH_MAX];
 
 /*
  * This is a generic function to set up a master socket for listening on