Revert "Revert "Removed the "fix_scrollbarbug" div and all references to it.""

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index 1bdd8c55da104b3419b9bc208f4e5403456f2569..c5bb3086c7ba8c76db3e9c7fe9b086a63d262f26 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions pertaining to rooms with a wiki view
  */
 
@@ -162,9 +160,7 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                StrBuf *author = NewStrBuf();
                StrBuf *node = NewStrBuf();
 
-               wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_history_background\">"
-               );
+               wc_printf("<table class=\"wiki_history_background\">");
 
                wc_printf("<th>%s</th>", _("Date"));
                wc_printf("<th>%s</th>", _("Author"));
@@ -284,10 +280,7 @@ void tmplput_display_wiki_pagelist(StrBuf *Target, WCTemplputParams *TP)
        if (GetServerStatus(Buf, NULL) == 1) {
                StrBuf *pagetitle = NewStrBuf();
 
-               wc_printf("<div class=\"fix_scrollbar_bug\">"
-                       "<table class=\"wiki_pagelist_background\">"
-               );
-
+               wc_printf("<table class=\"wiki_pagelist_background\">");
                wc_printf("<th>%s</th>", _("Page title"));
 
                while(StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) {
@@ -339,9 +332,13 @@ int wiki_Cleanup(void **ViewSpecific)
 
 int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
+       const char *page;
+       const char *pch;
+       long len;
 
-       return 1;
+       page = BSTR("page");
+       GetTemplateTokenString(Target, TP, 2, &pch, &len);
+       return strcasecmp(page, pch) == 0;
 }
 int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -349,8 +346,8 @@ int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
        const char *pch;
        long len;
 
-       GetTemplateTokenString(TP, &pch, &len, 2);
-       return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch);
+       GetTemplateTokenString(Target, TP, 1, &pch, &len);
+       return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch) != NULL;
 }
 void 
 InitModule_WIKI
@@ -371,6 +368,6 @@ InitModule_WIKI
        WebcitAddUrlHandler(HKEY("wiki_pagelist"), "", 0, display_wiki_pagelist, 0);
        RegisterNamespace("WIKI:DISPLAYHISTORY", 0, 0, tmplput_display_wiki_history, NULL, CTX_NONE);
        RegisterNamespace("WIKI:DISPLAYPAGELIST", 0, 0, tmplput_display_wiki_pagelist, NULL, CTX_NONE);
-       RegisterConditional(HKEY("COND:WIKI:PAGE"), 0, ConditionalHaveWikiPage, CTX_NONE);
-       RegisterConditional(HKEY("COND:WIKI:TYPE"), 0, ConditionalHavewikiType, CTX_NONE);
+       RegisterConditional(HKEY("COND:WIKI:PAGE"), 1, ConditionalHaveWikiPage, CTX_NONE);
+       RegisterConditional(HKEY("COND:WIKI:TYPE"), 1, ConditionalHavewikiType, CTX_NONE);
 }