* add a Display name to our handlers; this will be used by DAV handlers.

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 6c74212d5a8fded65120271c55f7d99f1d94c53d..e64e33cf9a6abc2e10b73658f093de504008e705 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,22 +1,14 @@
 /*
- * $Id:  $
- */
-/**
- *
- * \defgroup Wiki Wiki; Functions pertaining to rooms with a wiki view
+ * $Id$
  *
+ * Functions pertaining to rooms with a wiki view
  */
 
-/*@{*/
 #include "webcit.h"
 #include "groupdav.h"
 
-
-
-/** 
- * \brief Convert a string to something suitable as a wiki index
- *
- * \param s The string to be converted.
+/* 
+ * Convert a string to something suitable as a wiki index
  */
 void str_wiki_index(char *s)
 {
@@ -37,60 +29,47 @@ void str_wiki_index(char *s)
        }
 }
 
-/**
- * \brief Display a specific page from a wiki room
+/*
+ * Display a specific page from a wiki room
  */
-void display_wiki_page(void)
+void display_wiki_page_backend(const StrBuf *roomname, char *pagename)
 {
-       char roomname[128];
-       char pagename[128];
-       char errmsg[256];
+       const StrBuf *Mime;
        long msgnum = (-1L);
 
-       safestrncpy(roomname, bstr("room"), sizeof roomname);
-       safestrncpy(pagename, bstr("page"), sizeof pagename);
        str_wiki_index(pagename);
 
-       if (strlen(roomname) > 0) {
+       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)) {
-                       snprintf(errmsg, sizeof errmsg,
-                               _("There is no room called '%s'."),
-                               roomname);
-                       convenience_page("FF0000", _("Error"), errmsg);
+               if (strcasecmp(ChrPtr(roomname), ChrPtr(WC->wc_roomname))) {
+                       wprintf(_("There is no room called '%s'."), ChrPtr(roomname));
                        return;
                }
 
        }
 
        if (WC->wc_view != VIEW_WIKI) {
-               snprintf(errmsg, sizeof errmsg,
-                       _("'%s' is not a Wiki room."),
-                       roomname);
-               convenience_page("FF0000", _("Error"), errmsg);
+               wprintf(_("'%s' is not a Wiki room."), ChrPtr(roomname));
                return;
        }
 
-       if (strlen(pagename) == 0) {
+       if (IsEmptyStr(pagename)) {
                strcpy(pagename, "home");
        }
 
        /* Found it!  Now read it. */
        msgnum = locate_message_by_uid(pagename);
        if (msgnum >= 0L) {
-               output_headers(1, 1, 1, 0, 0, 0);
-               read_message(msgnum, 0, "");
-               wDumpContent(1);
+               read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
                return;
        }
 
-       output_headers(1, 1, 1, 0, 0, 0);
        wprintf("<br /><br />"
                "<div align=\"center\">"
                "<table border=\"0\" bgcolor=\"#ffffff\" cellpadding=\"10\">"
@@ -103,8 +82,48 @@ void display_wiki_page(void)
                "if you would like to create this page."));
        wprintf("<br><br>");
        wprintf("</td></tr></table></div>\n");
+}
+
+
+/*
+ * Display a specific page from a wiki room
+ */
+void display_wiki_page(void)
+{
+       const StrBuf *roomname;
+       char pagename[128];
+
+       output_headers(1, 1, 1, 0, 0, 0);
+       roomname = sbstr("room");
+       safestrncpy(pagename, bstr("page"), sizeof pagename);
+       display_wiki_page_backend(roomname, pagename);
        wDumpContent(1);
 }
 
 
-/** @} */
+int wiki_Cleanup(void **ViewSpecific)
+{
+       char pagename[5];
+       safestrncpy(pagename, "home", sizeof pagename);
+       display_wiki_page_backend(WC->wc_roomname, pagename);
+       wDumpContent(1);
+       return 0;
+}
+
+void 
+InitModule_WIKI
+(void)
+{
+       RegisterReadLoopHandlerset(
+               VIEW_WIKI,
+               NULL,
+               NULL,
+               NULL,
+               NULL,
+               wiki_Cleanup
+       );
+
+       WebcitAddUrlHandler(HKEY("wiki"), "", 0, display_wiki_page, 0);
+}
+
+