X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwiki.c;h=c1ba90512e81491293a25063ed3daed1c501b48e;hb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;hp=b7b03c1a0363e9885443263456f9d0b89a0be7b2;hpb=1bd684cdaefaae14ad8feb1d6adf2f7e4b6de8e4;p=citadel.git
diff --git a/webcit/wiki.c b/webcit/wiki.c
index b7b03c1a0..c1ba90512 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
@@ -46,19 +54,19 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
if (StrLength(roomname) > 0) {
/* If we're not in the correct room, try going there. */
- if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+ 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->wc_roomname))) {
+ if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) {
wc_printf(_("There is no room called '%s'."), ChrPtr(roomname));
return;
}
}
- if (WC->wc_view != VIEW_WIKI) {
+ if (WC->CurRoom.view != VIEW_WIKI) {
wc_printf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
return;
}
@@ -87,7 +95,7 @@ void display_wiki_page_backend(const StrBuf *roomname, char *pagename, char *rev
return;
}
- wc_printf("
"
+ wc_printf("
"
"
" @@ -115,6 +123,7 @@ void display_wiki_page(void) 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); @@ -139,12 +148,12 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) if (StrLength(roomname) > 0) { /* If we're not in the correct room, try going there. */ - if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) { + 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->wc_roomname))) { + if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->CurRoom.name))) { wc_printf(_("There is no room called '%s'."), ChrPtr(roomname)); return; } @@ -162,14 +171,12 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP) StrBuf *author = NewStrBuf(); StrBuf *node = NewStrBuf(); - wc_printf(" |