Room links in iconbar roomlist now properly escaped with encodeURIcomponent()

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 2afb0ebc553620d8f6b08f8b730f1a3ce666ed5e..6c8da5590b0465126d35a4da79ec5e81ce412fd7 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -181,7 +181,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                wc_printf("<th>%s</th>", _("Date"));
                wc_printf("<th>%s</th>", _("Author"));
 
-               while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+               while((StrBuf_ServGetln(Buf) >= 0) &&  strcmp(ChrPtr(Buf), "000")) {
 
                        rev_date = extract_long(ChrPtr(Buf), 1);
                        webcit_fmt_date(rev_date_displayed, sizeof rev_date_displayed, rev_date, DATEFMT_FULL);
@@ -217,7 +217,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                                        ChrPtr(rev_uuid),
                                        _("(show)")
                                );
-                               wc_printf("<td><a href=\"wiki?page=%s?rev=%s?revert=1\">%s</a></td>",
+                               wc_printf("<td><a href=\"javascript:GetLoggedInFirst(encodeURIComponent('wiki?page=%s?rev=%s?revert=1'))\">%s</a></td>",
                                        bstr("page"),
                                        ChrPtr(rev_uuid),
                                        _("(revert)")
@@ -256,7 +256,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
 void display_wiki_history(void)
 {
        output_headers(1, 1, 1, 0, 0, 0);
-       do_template("wiki_history", NULL);
+       do_template("wiki_history");
        wDumpContent(1);
 }
 
@@ -299,7 +299,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
                wc_printf("<table class=\"wiki_pagelist_background\">");
                wc_printf("<th>%s</th>", _("Page title"));
 
-               while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
+               while((StrBuf_ServGetln(Buf) >= 0) && strcmp(ChrPtr(Buf), "000")) {
                        StrBufExtract_token(pagetitle, Buf, 1, '|');
 
                        if (!bmstrcasestr((char *)ChrPtr(pagetitle), "_HISTORY_")) {    /* no history pages */
@@ -327,7 +327,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
 void display_wiki_pagelist(void)
 {
        output_headers(1, 1, 1, 0, 0, 0);
-       do_template("wiki_pagelist", NULL);
+       do_template("wiki_pagelist");
        wDumpContent(1);
 }
 
@@ -342,10 +342,6 @@ int wiki_Cleanup(void **ViewSpecific)
 }
 
 
-
-
-
-
 int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 {
        const char *page;
@@ -356,15 +352,19 @@ int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
        GetTemplateTokenString(Target, TP, 2, &pch, &len);
        return strcasecmp(page, pch) == 0;
 }
+
+
 int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
        const char *pch;
        long len;
 
-       GetTemplateTokenString(Target, TP, 1, &pch, &len);
+       GetTemplateTokenString(Target, TP, 2, &pch, &len);
        return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch) != NULL;
 }
+
+
 void 
 InitModule_WIKI
 (void)