X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=47af67ec4170f276b06deb8cb6c30d14694c1c3b;hb=2125d9ebd1c4914fe6ec6e6051fbc8e8f24b8b8b;hp=f0287eb0667c028c35824e465e54b9488e533d87;hpb=090d68398dee252c7001c1f71d536b5859dfd0c6;p=citadel.git diff --git a/webcit/wiki.c b/webcit/wiki.c index f0287eb06..47af67ec4 100644 --- a/webcit/wiki.c +++ b/webcit/wiki.c @@ -1,11 +1,19 @@ /* - * $Id$ - * * 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 +41,16 @@ void str_wiki_index(char *s) * Display a specific page from a wiki room * * "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) +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->wc_roomname))) { - gotoroom(roomname); - } - - /* If we're still not in the correct room, it doesn't exist. */ - if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) { - wc_printf(_("There is no room called '%s'."), ChrPtr(roomname)); - return; - } - - } - - if (WC->wc_view != VIEW_WIKI) { - wc_printf(_("'%s' is not a Wiki room."), ChrPtr(roomname)); + if (WC->CurRoom.view != VIEW_WIKI) { + wc_printf(_("'%s' is not a Wiki room."), ChrPtr(WC->CurRoom.name) ); return; } @@ -65,14 +58,27 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev strcpy(pagename, "home"); } - /* Found it! Now read it. FIXME this is where we have to add the ability to read an old rev */ - msgnum = locate_message_by_uid(pagename); + str_wiki_index(pagename); /* convert index name to lowercase and numeric only */ + + if ((rev != NULL) && (strlen(rev) > 0)) { + /* read an older revision */ + serv_printf("WIKI rev|%s|%s|%s", pagename, rev, (do_revert ? "revert" : "fetch") ); + serv_getln(buf, sizeof buf); + if (buf[0] == '2') { + msgnum = extract_long(&buf[4], 0); + } + } + else { + /* read the current revision */ + msgnum = locate_message_by_uid(pagename); + } + if (msgnum >= 0L) { read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime); return; } - wc_printf("

" + wc_printf("

" "
" "" "
" @@ -92,15 +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); - display_wiki_page_backend(roomname, pagename, rev); + do_revert = atoi(bstr("revert")); + display_wiki_page_backend(pagename, rev, do_revert); wDumpContent(1); } @@ -110,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->wc_roomname))) { - gotoroom(roomname); - } - - /* If we're still not in the correct room, it doesn't exist. */ - if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) { - wc_printf(_("There is no room called '%s'."), ChrPtr(roomname)); - return; - } - - } - serv_printf("WIKI history|%s", pagename); Buf = NewStrBuf(); StrBuf_ServGetln(Buf); @@ -145,25 +135,19 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) StrBuf *author = NewStrBuf(); StrBuf *node = NewStrBuf(); - wc_printf("
" - "" - ); + wc_printf("
"); wc_printf("", _("Date")); wc_printf("", _("Author")); - while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) { + while((StrBuf_ServGetln(Buf) >= 0) && strcmp(ChrPtr(Buf), "000")) { - StrBufExtract_token(rev_uuid, Buf, 0, '|'); rev_date = extract_long(ChrPtr(Buf), 1); webcit_fmt_date(rev_date_displayed, sizeof rev_date_displayed, rev_date, DATEFMT_FULL); StrBufExtract_token(author, Buf, 2, '|'); - StrBufExtract_token(node, Buf, 3, '|'); - wc_printf("", (row ? "#FFFFFF" : "#DDDDDD")); - row = 1 - row; + wc_printf("", ((row%2) ? "#FFFFFF" : "#DDDDDD")); wc_printf(""); - wc_printf("", - bstr("page"), - ChrPtr(rev_uuid), - _("(show)") - ); - wc_printf("", - bstr("page"), - ChrPtr(rev_uuid), - _("(revert)") - ); + if (row == 0) { + wc_printf("", _("(show)")); + wc_printf("", _("Current version")); + } + + else { + wc_printf("", _("(show)")); + wc_printf("", + bstr("page"), + ChrPtr(rev_uuid), + _("(revert)") + ); + } wc_printf("\n"); + + /* Extract all fields except the author and date after displaying the row. This + * is deliberate, because the timestamp reflects when the diff was written, not + * when the version which it reflects was written. Similarly, the name associated + * with each diff is the author who created the newer version of the page that + * made the diff happen. + */ + StrBufExtract_token(rev_uuid, Buf, 0, '|'); + StrBufExtract_token(node, Buf, 3, '|'); + ++row; } wc_printf("
%s%s
%s", rev_date_displayed); - if (!strcasecmp(ChrPtr(node), (char *)WC->serv_info->serv_nodename)) { escputs(ChrPtr(author)); wc_printf(" @ "); @@ -176,18 +160,39 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) escputs(ChrPtr(author)); wc_printf(""); } + wc_printf("%s%s%s(%s)%s%s
\n"); @@ -210,7 +215,63 @@ 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); +} + + +/* + * Display a list of all pages in a Wiki room (template callback) + */ +void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP) +{ + StrBuf *Buf; + int row = 0; + + if (!IsEmptyStr(bstr("query"))) { + serv_printf("MSGS SEARCH|%s||4", bstr("query")); /* search-reduced list */ + } + else { + serv_printf("MSGS ALL|||4"); /* full list */ + } + + Buf = NewStrBuf(); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 1) { + StrBuf *pagetitle = NewStrBuf(); + + wc_printf(""); + wc_printf("", _("Page title")); + + while((StrBuf_ServGetln(Buf) >= 0) && strcmp(ChrPtr(Buf), "000")) { + StrBufExtract_token(pagetitle, Buf, 1, '|'); + + if (!bmstrcasestr((char *)ChrPtr(pagetitle), "_HISTORY_")) { /* no history pages */ + wc_printf("", ((row%2) ? "#FFFFFF" : "#DDDDDD")); + wc_printf(""); + wc_printf("\n"); + ++row; + } + } + wc_printf("
%s
"); + escputs(ChrPtr(pagetitle)); + wc_printf("
\n"); + FreeStrBuf(&pagetitle); + } + + FreeStrBuf(&Buf); +} + + +/* + * Display a list of all pages in a Wiki room. Search requests in a Wiki room also go here. + */ +void display_wiki_pagelist(void) +{ + output_headers(1, 1, 1, 0, 0, 0); + do_template("wiki_pagelist"); wDumpContent(1); } @@ -219,17 +280,66 @@ int wiki_Cleanup(void **ViewSpecific) { char pagename[5]; safestrncpy(pagename, "home", sizeof pagename); - display_wiki_page_backend(WC->wc_roomname, pagename, ""); + display_wiki_page_backend(pagename, "", 0); wDumpContent(1); return 0; } + +int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP) +{ + const char *page; + const char *pch; + long len; + + page = BSTR("page"); + 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, 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, @@ -239,5 +349,9 @@ InitModule_WIKI WebcitAddUrlHandler(HKEY("wiki"), "", 0, display_wiki_page, 0); WebcitAddUrlHandler(HKEY("wiki_history"), "", 0, display_wiki_history, 0); + 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); }