* Fixed a bug that was causing the initial visit to a Wiki room to fetch the page...

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index b7b03c1a0363e9885443263456f9d0b89a0be7b2..c4292f6091db8d1012b13bcfa0212930e69dffef 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -272,14 +272,20 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
                }
        }
 
-       serv_printf("MSGS ALL|||4");
+       if (!IsEmptyStr(bstr("query"))) {
+               serv_printf("MSGS SEARCH|%s||4", bstr("query"));        /* search-reduced list */
+       }
+       else {
+               serv_printf("MSGS ALL|||4");                            /* full list */
+       }
+
        Buf = NewStrBuf();
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) == 1) {
                StrBuf *pagetitle = NewStrBuf();
 
                wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_history_background\">"     /* FIXME make its own class */
+                       "<table class=\"wiki_pagelist_background\">"
                );
 
                wc_printf("<th>%s</th>", _("Page title"));
@@ -289,9 +295,11 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 
                        if (!bmstrcasestr((char *)ChrPtr(pagetitle), "_HISTORY_")) {    /* no history pages */
                                wc_printf("<tr bgcolor=\"%s\">", ((row%2) ? "#FFFFFF" : "#DDDDDD"));
-                               wc_printf("<td>");
-                               escputs(ChrPtr(pagetitle));             /* FIXME make it linkable */
-                               wc_printf("</td>");
+                               wc_printf("<td><a href=\"wiki?page=");
+                               urlescputs(ChrPtr(pagetitle));
+                               wc_printf("\">");
+                               escputs(ChrPtr(pagetitle));
+                               wc_printf("</a></td>");
                                wc_printf("</tr>\n");
                                ++row;
                        }
@@ -305,7 +313,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 
 
 /*
- * Display a list of all pages in a Wiki room
+ * Display a list of all pages in a Wiki room.  Search requests in a Wiki room also go here.
  */
 void display_wiki_pagelist(void)
 {