X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=ef1a4441212dad909e6ee031dd6df87b11319364;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=79ade49e2066fd1ab0be5ba2aef5bdd06b4b9a09;hpb=8fa17e06dbbd9a2b4530011797ef7fb382ebb283;p=citadel.git

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 79ade49e2..ef1a44412 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -19,7 +19,7 @@
  */
 
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 
 /* 
  * Convert a string to something suitable as a wiki index
@@ -181,7 +181,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 		wc_printf("<th>%s</th>", _("Date"));
 		wc_printf("<th>%s</th>", _("Author"));
 
-		while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+		while((StrBuf_ServGetln(Buf) >= 0) &&  strcmp(ChrPtr(Buf), "000")) {
 
 			rev_date = extract_long(ChrPtr(Buf), 1);
 			webcit_fmt_date(rev_date_displayed, sizeof rev_date_displayed, rev_date, DATEFMT_FULL);
@@ -256,7 +256,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 void display_wiki_history(void)
 {
 	output_headers(1, 1, 1, 0, 0, 0);
-	do_template("wiki_history", NULL);
+	do_template("wiki_history");
 	wDumpContent(1);
 }
 
@@ -299,7 +299,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 		wc_printf("<table class=\"wiki_pagelist_background\">");
 		wc_printf("<th>%s</th>", _("Page title"));
 
-		while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+		while((StrBuf_ServGetln(Buf) >= 0) && strcmp(ChrPtr(Buf), "000")) {
 			StrBufExtract_token(pagetitle, Buf, 1, '|');
 
 			if (!bmstrcasestr((char *)ChrPtr(pagetitle), "_HISTORY_")) {	/* no history pages */
@@ -327,7 +327,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 void display_wiki_pagelist(void)
 {
 	output_headers(1, 1, 1, 0, 0, 0);
-	do_template("wiki_pagelist", NULL);
+	do_template("wiki_pagelist");
 	wDumpContent(1);
 }
 
@@ -342,10 +342,6 @@ int wiki_Cleanup(void **ViewSpecific)
 }
 
 
-
-
-
-
 int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 {
 	const char *page;
@@ -356,22 +352,50 @@ int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 	GetTemplateTokenString(Target, TP, 2, &pch, &len);
 	return strcasecmp(page, pch) == 0;
 }
+
+
 int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;
 	const char *pch;
 	long len;
 
-	GetTemplateTokenString(Target, TP, 1, &pch, &len);
+	GetTemplateTokenString(Target, TP, 2, &pch, &len);
 	return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch) != NULL;
 }
+
+
+int wiki_PrintHeaderPage(SharedMessageStatus *Stat, void **ViewSpecific)
+{
+	/* this function was intentionaly left empty. */
+	return 0;
+}
+
+int wiki_GetParamsGetServerCall(SharedMessageStatus *Stat, 
+				void **ViewSpecific, 
+				long oper, 
+				char *cmd, 
+				long len,
+				char *filter,
+				long flen)
+{
+	if (oper == do_search)
+		display_wiki_pagelist();
+	else 
+		http_redirect("wiki?page=home");
+
+	return 300;
+}
+
+
 void 
 InitModule_WIKI
 (void)
 {
 	RegisterReadLoopHandlerset(
 		VIEW_WIKI,
-		NULL,
+		wiki_GetParamsGetServerCall,
+		wiki_PrintHeaderPage,
 		NULL,
 		NULL,
 		NULL,