X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=b1822e951a0ee17d5df2bcc5b63d6df8cb467977;hb=HEAD;hp=e4d7de44aa96c9da2977f1533a61ff109a552d58;hpb=b6f9ea45400e77a7710f811031ea8ffe42d16c98;p=citadel.git diff --git a/webcit/wiki.c b/webcit/wiki.c index e4d7de44a..390bf3cbe 100644 --- a/webcit/wiki.c +++ b/webcit/wiki.c @@ -1,32 +1,27 @@ /* - * $Id$ - * * Functions pertaining to rooms with a wiki view + * + * Copyright (c) 2009-2021 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 */ -void str_wiki_index(char *s) +void str_wiki_index(StrBuf *s) { - int i; - - if (s == NULL) return; - - /* First remove all non-alphanumeric characters */ - for (i=0; i 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; } - if (IsEmptyStr(pagename)) { - strcpy(pagename, "home"); + if (StrLength(pagename) == 0) { + StrBufPlain(pagename, HKEY("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 */ - serv_printf("WIKI rev|%s|%s|%s", pagename, rev, (do_revert ? "revert" : "fetch") ); + serv_printf("WIKI rev|%s|%s|%s", ChrPtr(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); + /* read the current revision */ + msgnum = locate_message_by_uid(ChrPtr(pagename)); } if (msgnum >= 0L) { - read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime); + read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL); return; } - - wc_printf("

" - "
" - "" - "
" - ); - wc_printf("
"); - wc_printf(_("There is no page called '%s' here."), pagename); - wc_printf("

"); - wc_printf(_("Select the 'Edit this page' link in the room banner " - "if you would like to create this page.")); - wc_printf("

"); - wc_printf("
\n"); + putbstr("pagename", pagename); + do_template("wiki_empty"); } @@ -107,17 +74,16 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev */ void display_wiki_page(void) { - const StrBuf *roomname; - char pagename[128]; + StrBuf *pagename; char rev[128]; int do_revert = 0; output_headers(1, 1, 1, 0, 0, 0); - roomname = sbstr("room"); - safestrncpy(pagename, bstr("page"), sizeof pagename); + pagename = NewStrBufDup(sbstr("page")); + 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); } @@ -127,31 +93,14 @@ void display_wiki_page(void) */ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) { - const StrBuf *roomname; - char pagename[128]; + StrBuf *pagename; StrBuf *Buf; int row = 0; - roomname = sbstr("room"); - safestrncpy(pagename, bstr("page"), sizeof pagename); + pagename = NewStrBufDup(sbstr("page")); 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); + serv_printf("WIKI history|%s", ChrPtr(pagename)); Buf = NewStrBuf(); StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) == 1) { @@ -162,14 +111,12 @@ 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")) { rev_date = extract_long(ChrPtr(Buf), 1); webcit_fmt_date(rev_date_displayed, sizeof rev_date_displayed, rev_date, DATEFMT_FULL); @@ -177,35 +124,27 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) wc_printf("", ((row%2) ? "#FFFFFF" : "#DDDDDD")); wc_printf(""); + wc_printf(""); + escputs(ChrPtr(author)); + wc_printf(""); if (row == 0) { - wc_printf("", - bstr("page"), - _("(show)") - ); + wc_printf("", _("(show)")); wc_printf("", _("Current version")); } else { - wc_printf("", + wc_printf("", + wc_printf("?go="); urlescputs(ChrPtr(WC->CurRoom.name)); + wc_printf("\">%s", _("(show)")); + wc_printf("", bstr("page"), ChrPtr(rev_uuid), _("(revert)") @@ -244,7 +183,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); } @@ -254,24 +193,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 */ } @@ -284,13 +208,10 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP) if (GetServerStatus(Buf, NULL) == 1) { StrBuf *pagetitle = NewStrBuf(); - wc_printf("
" - "
%s%s
%s", rev_date_displayed); - if (!strcasecmp(ChrPtr(node), (char *)WC->serv_info->serv_nodename)) { - escputs(ChrPtr(author)); - wc_printf(" @ "); - escputs(ChrPtr(node)); - } - else { - wc_printf(""); - escputs(ChrPtr(author)); - wc_printf(""); - } - wc_printf("%s%s(%s)%s%s%s
" - ); - + wc_printf("
"); wc_printf("", _("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 */ @@ -318,25 +239,21 @@ 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); } int wiki_Cleanup(void **ViewSpecific) { - char pagename[5]; - safestrncpy(pagename, "home", sizeof pagename); - display_wiki_page_backend(WC->CurRoom.name, pagename, "", 0); + StrBuf *pagename; + pagename = NewStrBufDup(sbstr("page")); + display_wiki_page_backend(pagename, "", 0); wDumpContent(1); return 0; } - - - - int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP) { const char *page; @@ -347,27 +264,55 @@ 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); - return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch) != NULL; + GetTemplateTokenString(Target, TP, 2, &pch, &len); + return bmstrcasestr((char *)ChrPtr(WC->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, - NULL, - wiki_Cleanup + wiki_Cleanup, + NULL ); WebcitAddUrlHandler(HKEY("wiki"), "", 0, display_wiki_page, 0); @@ -375,6 +320,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); }
%s