X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=ef1a4441212dad909e6ee031dd6df87b11319364;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=452fc82ec4df569a2c3b0012492567729a4a8fc4;hpb=8f4931397e1e983371475109ebe1e0a4983fb4f2;p=citadel.git diff --git a/webcit/wiki.c b/webcit/wiki.c index 452fc82ec..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("
%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 +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); } @@ -365,13 +365,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,
---|