* output the mime type of the tepmlate in read_message so we can have different ones

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 6efa604710b52f815d6c313a90cc4cade5ad6152..ca904d1a483ae727bf6534be308cbad515b4d931 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -34,27 +34,28 @@ void str_wiki_index(char *s)
  */
 void display_wiki_page(void)
 {
-       char roomname[128];
+       const StrBuf *Mime;
+       const StrBuf *roomname;
        char pagename[128];
        char errmsg[256];
        long msgnum = (-1L);
 
-       safestrncpy(roomname, bstr("room"), sizeof roomname);
+       roomname = sbstr("room");
        safestrncpy(pagename, bstr("page"), sizeof pagename);
        str_wiki_index(pagename);
 
-       if (!IsEmptyStr(roomname)) {
+       if (StrLength(roomname) > 0) {
 
                /* If we're not in the correct room, try going there. */
-               if (strcasecmp(roomname, WC->wc_roomname)) {
+               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(roomname, WC->wc_roomname)) {
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
                        snprintf(errmsg, sizeof errmsg,
-                               _("There is no room called '%s'."),
-                               roomname);
+                                _("There is no room called '%s'."),
+                                ChrPtr(roomname));
                        convenience_page("FF0000", _("Error"), errmsg);
                        return;
                }
@@ -64,7 +65,7 @@ void display_wiki_page(void)
        if (WC->wc_view != VIEW_WIKI) {
                snprintf(errmsg, sizeof errmsg,
                        _("'%s' is not a Wiki room."),
-                       roomname);
+                        ChrPtr(roomname));
                convenience_page("FF0000", _("Error"), errmsg);
                return;
        }
@@ -77,7 +78,7 @@ void display_wiki_page(void)
        msgnum = locate_message_by_uid(pagename);
        if (msgnum >= 0L) {
                output_headers(1, 1, 1, 0, 0, 0);
-               read_message(msgnum, 0, "");
+               read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
                wDumpContent(1);
                return;
        }
@@ -97,3 +98,11 @@ void display_wiki_page(void)
        wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
+
+void 
+InitModule_WIKI
+(void)
+{
+       WebcitAddUrlHandler(HKEY("wiki"), display_wiki_page, 0);
+       return ;
+}