From d2bd471495bc403fbeb62454f421f3bf13440a50 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 23 May 2005 19:30:34 +0000
Subject: [PATCH] * Move "enable full text" checkbox configuration to its new
 location in   the configuration back end.

---
 webcit/ChangeLog    |  5 ++++-
 webcit/siteconfig.c | 24 ++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 132b0255c..c26591e13 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 610.6  2005/05/23 19:30:34  ajc
+* Move "enable full text" checkbox configuration to its new location in
+  the configuration back end.
+
 Revision 610.5  2005/05/22 16:20:09  ajc
 * siteconfig.c: add checkbox for enabling full text index on server
 
@@ -2520,4 +2524,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index f848658b1..319500b4a 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -474,17 +474,10 @@ void display_siteconfig(void)
 			}
 			break;
 		case 31:
-			if (!strcasecmp(whichmenu, "general")) {
-				wprintf("<TR><TD>Enable full text index (warning: resource intensive)</TD><TD>");
-				wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-				wprintf("</TD></TR>\n");
-			}
-			else {
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_enable_fulltext\" VALUE=\"%s\">", buf);
-			}
+			/* niu */
 			break;
 		case 32:
-			if (!strcasecmp(whichmenu, "tuning")) {
+			if (!strcasecmp(whichmenu, "purger")) {
 				wprintf("<TR><TD>Hour to run database auto-purge</TD><TD>");
 				wprintf("<SELECT NAME=\"c_purge_hour\" SIZE=\"1\">\n");
 				for (j=0; j<=23; ++j) {
@@ -602,6 +595,16 @@ void display_siteconfig(void)
 				wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_smtps_port\" VALUE=\"%s\">", buf);
 			}
 			break;
+		case 43:
+			if (!strcasecmp(whichmenu, "general")) {
+				wprintf("<TR><TD>Enable full text index (warning: resource intensive)</TD><TD>");
+				wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+				wprintf("</TD></TR>\n");
+			}
+			else {
+				wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_enable_fulltext\" VALUE=\"%s\">", buf);
+			}
+			break;
 		}
 	}
 
@@ -721,7 +724,7 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_imap_port"));
 	serv_printf("%s", bstr("c_net_freq"));
 	serv_printf("%s", ((!strcasecmp(bstr("c_disable_newu"), "yes") ? "1" : "0")));
-	serv_printf("%s", ((!strcasecmp(bstr("c_enable_fulltext"), "yes") ? "1" : "0")));
+	serv_printf("1");
 	serv_printf("%s", bstr("c_purge_hour"));
 	serv_printf("%s", bstr("c_ldap_host"));
 	serv_printf("%s", bstr("c_ldap_port"));
@@ -733,6 +736,7 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_imaps_port"));
 	serv_printf("%s", bstr("c_pop3s_port"));
 	serv_printf("%s", bstr("c_smtps_port"));
+	serv_printf("%s", ((!strcasecmp(bstr("c_enable_fulltext"), "yes") ? "1" : "0")));
 	serv_printf("000");
 
 	serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
-- 
2.30.2