From 86a1d535af8c52cc9536b03b707eed2d8674da31 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 23 Apr 2012 18:06:11 -0400 Subject: [PATCH] Removed the 'room=' parameter from the wiki view. This functionality is provided globally by the 'go=' parameter. --- webcit/static/t/view_message/wikiedit.html | 4 +- webcit/wiki.c | 57 ++-------------------- 2 files changed, 7 insertions(+), 54 deletions(-) diff --git a/webcit/static/t/view_message/wikiedit.html b/webcit/static/t/view_message/wikiedit.html index ac3f3102e..a44881877 100644 --- a/webcit/static/t/view_message/wikiedit.html +++ b/webcit/static/t/view_message/wikiedit.html @@ -1,2 +1,4 @@ - + + + diff --git a/webcit/wiki.c b/webcit/wiki.c index c1ba90512..186bd00ca 100644 --- a/webcit/wiki.c +++ b/webcit/wiki.c @@ -43,7 +43,7 @@ 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); @@ -51,23 +51,8 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev 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; } @@ -115,18 +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); } @@ -136,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); @@ -261,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 */ } @@ -331,7 +282,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; } -- 2.30.2