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

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 34067244f..ec746fe86 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
@@ -33,31 +43,16 @@ void str_wiki_index(char *s)
  * "rev" may be set to an empty string to display the current version.
  * "do_revert" may be set to nonzero to perform a reversion to the specified version.
  */
-void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev, int do_revert)
+void display_wiki_page_backend(char *pagename, char *rev, int do_revert)
 {
+	wcsession *WCC = WC;
 	const StrBuf *Mime;
 	long msgnum = (-1L);
 	char buf[256];
 
-	str_wiki_index(pagename);
-
-	if (StrLength(roomname) > 0) {
-
-		/* If we're not in the correct room, try going there. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			gotoroom(roomname);
-		}
-	
-		/* If we're still not in the correct room, it doesn't exist. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
-			return;
-		}
-
-	}
-
-	if (WC->CurRoom.view != VIEW_WIKI) {
-		wc_printf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
+	if ((WCC->CurRoom.view != VIEW_WIKI) &&
+	    (WCC->CurRoom.view != VIEW_WIKIMD)) {
+		wc_printf(_("'%s' is not a Wiki room."), ChrPtr(WCC->CurRoom.name) );
 		return;
 	}
 
@@ -65,7 +60,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
 		strcpy(pagename, "home");
 	}
 
-	/* Found it!  Now read it. */
+	str_wiki_index(pagename);	/* convert index name to lowercase and numeric only */
 
 	if ((rev != NULL) && (strlen(rev) > 0)) {
 		/* read an older revision */
@@ -76,16 +71,16 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
 		}
 	}
 	else {
-		/* read the current revision? */
+		/* read the current revision */
 		msgnum = locate_message_by_uid(pagename);
 	}
 
 	if (msgnum >= 0L) {
-		read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+		read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
 		return;
 	}
 
-	wc_printf("<br /><br />"
+	wc_printf("<br><br>"
 		"<div align=\"center\">"
 		"<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
 		"<tr><td align=\"center\">"
@@ -105,17 +100,16 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
  */
 void display_wiki_page(void)
 {
-	const StrBuf *roomname;
 	char pagename[128];
 	char rev[128];
 	int do_revert = 0;
 
 	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);
+	display_wiki_page_backend(pagename, rev, do_revert);
 	wDumpContent(1);
 }
 
@@ -125,30 +119,13 @@ void display_wiki_page(void)
  */
 void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 {
-	const StrBuf *roomname;
 	char pagename[128];
 	StrBuf *Buf;
 	int row = 0;
 
-	roomname = sbstr("room");
 	safestrncpy(pagename, bstr("page"), sizeof pagename);
 	str_wiki_index(pagename);
 
-	if (StrLength(roomname) > 0) {
-
-		/* If we're not in the correct room, try going there. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			gotoroom(roomname);
-		}
-	
-		/* If we're still not in the correct room, it doesn't exist. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
-			return;
-		}
-
-	}
-
 	serv_printf("WIKI history|%s", pagename);
 	Buf = NewStrBuf();
 	StrBuf_ServGetln(Buf);
@@ -160,14 +137,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);
@@ -190,20 +165,20 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 			wc_printf("</td>");
 
 			if (row == 0) {
-				wc_printf("<td><a href=\"wiki?page=%s\">%s</a></td>",
-					bstr("page"),
-					_("(show)")
-				);
+				wc_printf("<td><a href=\"wiki?page=%s", bstr("page"));
+				wc_printf("?go="); urlescputs(ChrPtr(WC->CurRoom.name));
+				wc_printf("\">%s</a></td>", _("(show)"));
 				wc_printf("<td>(%s)</td>", _("Current version"));
 			}
 
 			else {
-				wc_printf("<td><a href=\"wiki?page=%s?rev=%s\">%s</a></td>",
+				wc_printf("<td><a href=\"wiki?page=%s?rev=%s",
 					bstr("page"),
-					ChrPtr(rev_uuid),
-					_("(show)")
+					ChrPtr(rev_uuid)
 				);
-				wc_printf("<td><a href=\"wiki?page=%s?rev=%s?revert=1\">%s</a></td>",
+				wc_printf("?go="); urlescputs(ChrPtr(WC->CurRoom.name));
+				wc_printf("\">%s</a></td>", _("(show)"));
+				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 +217,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);
 }
 
@@ -252,24 +227,9 @@ void display_wiki_history(void)
  */
 void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 {
-	const StrBuf *roomname;
 	StrBuf *Buf;
 	int row = 0;
 
-	roomname = sbstr("room");
-	if (StrLength(roomname) > 0) {
-		/* If we're not in the correct room, try going there. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			gotoroom(roomname);
-		}
-	
-		/* If we're still not in the correct room, it doesn't exist. */
-		if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
-			wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
-			return;
-		}
-	}
-
 	if (!IsEmptyStr(bstr("query"))) {
 		serv_printf("MSGS SEARCH|%s||4", bstr("query"));	/* search-reduced list */
 	}
@@ -282,13 +242,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 +273,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);
 }
 
@@ -325,16 +282,12 @@ int wiki_Cleanup(void **ViewSpecific)
 {
 	char pagename[5];
 	safestrncpy(pagename, "home", sizeof pagename);
-	display_wiki_page_backend(WC->CurRoom.name, pagename, "", 0);
+	display_wiki_page_backend(pagename, "", 0);
 	wDumpContent(1);
 	return 0;
 }
 
 
-
-
-
-
 int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 {
 	const char *page;
@@ -345,24 +298,63 @@ 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,
+		wiki_GetParamsGetServerCall,
+		wiki_PrintHeaderPage,
+		NULL,
 		NULL,
 		NULL,
 		NULL,
+		wiki_Cleanup
+	);
+
+	RegisterReadLoopHandlerset(
+		VIEW_WIKIMD,
+		wiki_GetParamsGetServerCall,
+		wiki_PrintHeaderPage,
+		NULL,
+		NULL,
 		NULL,
 		NULL,
 		wiki_Cleanup
@@ -373,6 +365,6 @@ InitModule_WIKI
 	WebcitAddUrlHandler(HKEY("wiki_pagelist"), "", 0, display_wiki_pagelist, 0);
 	RegisterNamespace("WIKI:DISPLAYHISTORY", 0, 0, tmplput_display_wiki_history, NULL, CTX_NONE);
 	RegisterNamespace("WIKI:DISPLAYPAGELIST", 0, 0, tmplput_display_wiki_pagelist, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:WIKI:PAGE"), 1, ConditionalHaveWikiPage, CTX_NONE);
-	RegisterConditional(HKEY("COND:WIKI:TYPE"), 1, ConditionalHavewikiType, CTX_NONE);
+	RegisterConditional("COND:WIKI:PAGE", 1, ConditionalHaveWikiPage, CTX_NONE);
+	RegisterConditional("COND:WIKI:TYPE", 1, ConditionalHavewikiType, CTX_NONE);
 }