X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=c1ba90512e81491293a25063ed3daed1c501b48e;hb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;hp=34067244f533a9f5091dccacbc4c689632ef749f;hpb=1b278ca1243861adba31579d1633b11c8e096271;p=citadel.git

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 34067244f..c1ba90512 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,9 +1,19 @@
 /*
  * Functions pertaining to rooms with a wiki view
+ *
+ * Copyright (c) 2009-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 
 /* 
  * Convert a string to something suitable as a wiki index
@@ -85,7 +95,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
 		return;
 	}
 
-	wc_printf("<br /><br />"
+	wc_printf("<br><br>"
 		"<div align=\"center\">"
 		"<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
 		"<tr><td align=\"center\">"
@@ -113,6 +123,7 @@ void display_wiki_page(void)
 	output_headers(1, 1, 1, 0, 0, 0);
 	roomname = sbstr("room");
 	safestrncpy(pagename, bstr("page"), sizeof pagename);
+	str_wiki_index(pagename);
 	safestrncpy(rev, bstr("rev"), sizeof rev);
 	do_revert = atoi(bstr("revert"));
 	display_wiki_page_backend(roomname, pagename, rev, do_revert);
@@ -160,14 +171,12 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 		StrBuf *author = NewStrBuf();
 		StrBuf *node = NewStrBuf();
 
-		wc_printf("<div class=\"fix_scrollbar_bug\">"
-			"<table class=\"wiki_history_background\">"
-		);
+		wc_printf("<table class=\"wiki_history_background\">");
 
 		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);
@@ -203,7 +212,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 					ChrPtr(rev_uuid),
 					_("(show)")
 				);
-				wc_printf("<td><a href=\"wiki?page=%s?rev=%s?revert=1\">%s</a></td>",
+				wc_printf("<td><a href=\"javascript:GetLoggedInFirst(encodeURIComponent('wiki?page=%s?rev=%s?revert=1'))\">%s</a></td>",
 					bstr("page"),
 					ChrPtr(rev_uuid),
 					_("(revert)")
@@ -242,7 +251,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);
 }
 
@@ -282,13 +291,10 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 	if (GetServerStatus(Buf, NULL) == 1) {
 		StrBuf *pagetitle = NewStrBuf();
 
-		wc_printf("<div class=\"fix_scrollbar_bug\">"
-			"<table class=\"wiki_pagelist_background\">"
-		);
-
+		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 */
@@ -316,7 +322,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);
 }
 
@@ -331,10 +337,6 @@ int wiki_Cleanup(void **ViewSpecific)
 }
 
 
-
-
-
-
 int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 {
 	const char *page;
@@ -345,22 +347,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,