From 50ad219614464de0fd2a64d2f924ec276fc4820a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Thu, 5 Aug 2010 21:07:51 +0000
Subject: [PATCH] * migrate search-o-matic to template only.

---
 webcit/roomops.c                  | 17 -----------------
 webcit/serv_func.c                |  2 +-
 webcit/static/t/roombanner.html   |  2 +-
 webcit/static/t/roombanner.m.html |  2 +-
 webcit/static/t/searchomatic.html |  7 +++++++
 5 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 webcit/static/t/searchomatic.html

diff --git a/webcit/roomops.c b/webcit/roomops.c
index aa771800f..e49816b75 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -318,22 +318,6 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-/*
- * Display a search box
- */
-void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
-{
-	wc_printf("<form name=\"searchomatic\" action=\"do_search\">\n");
-	wc_printf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wc_printf("<label for=\"srchquery\">");
-	wc_printf(_("Search: "));
-	wc_printf("</label><input ");
-	wc_printf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
-	wc_printf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
-		);
-	wc_printf("</div></form>\n");
-}
-
 
 /*
  * Embed the room banner
@@ -409,7 +393,6 @@ void embed_room_banner(char *got, int navbar_style) {
 		);
 	svcallback("ROOMINFO", readinfo);
 	svcallback("VIEWOMATIC", embed_view_o_matic); 
-	svcallback("SEARCHOMATIC", embed_search_o_matic);
 	svcallback("START", offer_start_page); 
  
 	do_template("roombanner", NULL);
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 50bf1f771..755469ccd 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -758,7 +758,7 @@ InitModule_SERVFUNC
 
 	RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+	RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
 	RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
 	RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
 	RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 73ffa829d..b4cef3cd2 100644
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -19,7 +19,7 @@
 <td id="actiondiv">
 <ul class="room_actions">
 <li class="start_page"><?START></li>
-<li class="search" id="searchomatic"><?SEARCHOMATIC></li>
+<li class="search" id="searchomatic"><?=("searchomatic")></li>
 <li class="view"><?VIEWOMATIC></li>
 <??("COND:SUBST", 1, "WCVIEW", "1")><li class="hidden" id="selectpage"><?_("Select page: ")> <select id="summpage"><option> </option></select></li><??("X",1)>
 </ul>
diff --git a/webcit/static/t/roombanner.m.html b/webcit/static/t/roombanner.m.html
index 05a4f2007..7ae78410f 100644
--- a/webcit/static/t/roombanner.m.html
+++ b/webcit/static/t/roombanner.m.html
@@ -2,6 +2,6 @@
 <div class="banner" >
 <h1 class="roomname"><?=("room_view_picture")> <?ROOMNAME></h1>
 <p><?ROOMINFO> <?NUMMSGS></p>
-<p><?START> <?SEARCHOMATIC></p>
+<p><?START> <?=("searchomatic"></p>
 </div>
 <!-- end roombanner.html -->
diff --git a/webcit/static/t/searchomatic.html b/webcit/static/t/searchomatic.html
new file mode 100644
index 000000000..f348dc1d3
--- /dev/null
+++ b/webcit/static/t/searchomatic.html
@@ -0,0 +1,7 @@
+<form name="searchomatic" action="do_search">
+	<div style="display: inline;">
+		<input type="hidden" name="nonce" value="<?NONCE>">
+		<label for="srchquery"><?_("Search: ")></label>
+		<input <??("COND:SERV:FULLTEXT_ENABLED", 1, "something needed here", 1,  "", "disabled='disabled'")> type="text" name="query" id="srchquery" size="15" maxlength="128" class="inputbox">
+	</div>
+</form>
-- 
2.30.2