X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=47af67ec4170f276b06deb8cb6c30d14694c1c3b;hb=2125d9ebd1c4914fe6ec6e6051fbc8e8f24b8b8b;hp=452fc82ec4df569a2c3b0012492567729a4a8fc4;hpb=8f4931397e1e983371475109ebe1e0a4983fb4f2;p=citadel.git
diff --git a/webcit/wiki.c b/webcit/wiki.c
index 452fc82ec..47af67ec4 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,25 +1,19 @@
/*
* Functions pertaining to rooms with a wiki view
*
- * Copyright (c) 2009-2011 by the citadel.org team
+ * 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
/*
* Convert a string to something suitable as a wiki index
@@ -49,31 +43,14 @@ 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)
{
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));
+ wc_printf(_("'%s' is not a Wiki room."), ChrPtr(WC->CurRoom.name) );
return;
}
@@ -81,7 +58,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 */
@@ -92,7 +69,7 @@ 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);
}
@@ -121,17 +98,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);
}
@@ -141,30 +117,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);
@@ -181,7 +140,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
wc_printf("| %s | ", _("Date"));
wc_printf("%s | ", _("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);
@@ -204,19 +163,19 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
wc_printf("");
if (row == 0) {
- wc_printf("%s | ",
- bstr("page"),
- _("(show)")
- );
+ wc_printf("%s | ", _("(show)"));
wc_printf("(%s) | ", _("Current version"));
}
else {
- wc_printf("%s | ",
+ wc_printf("%s | ", _("(show)"));
wc_printf("%s | ",
bstr("page"),
ChrPtr(rev_uuid),
@@ -256,7 +215,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);
}
@@ -266,24 +225,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 */
}
@@ -299,7 +243,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
wc_printf("");
wc_printf("| %s | ", _("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 +271,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);
}
@@ -336,7 +280,7 @@ 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;
}
@@ -365,13 +309,37 @@ int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
}
+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,