From b6f9ea45400e77a7710f811031ea8ffe42d16c98 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 24 Aug 2010 22:29:16 +0000
Subject: [PATCH] * fix wiki navbar (partly ;-)

---
 webcit/static/t/navbar.html |  7 ++++---
 webcit/wiki.c               | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 121f69d6b..ef6d73a11 100644
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -126,13 +126,14 @@
 <??("X", 70)>
 
 <?!("COND:THISROOM:CURR_VIEW", 80, #"VIEW_WIKI")>
+        <?!("COND:WIKI:PAGE", 81, "home")>
 	<li class="readallmess">
 		<a href="wiki?page=home">
 			<img src="static/readallmess3_24x.gif" alt="" width="24" height="24">
 			<span class="navbar_link"><?_("Wiki home")></span>
 		</a>
 	</li>
-	<?!("COND:WIKI:PAGE", 82, "home")>
+	<?!("X", 81)><??("COND:WIKI:PAGE", 82, "home")>
 		<li class="newmess">
 				<a href="display_enter<?BSTR:FORWARD("page", "U")>">
 					<img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
@@ -141,9 +142,9 @@
 			</li>
 	<??("X", 82)>
 		<li class="newmess">
-			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "wiki_history", "", "_history")><?BSTR:FORWARD("page", "U")>">
+			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "", "", "_history")><?BSTR:FORWARD("page", "U")>">
 				<img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
-				<span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "wut?", '_("Current version")', '_("History")')></span>
+				<span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "", _("Current version", _("History"))></span>
 			</a>
 		</li>
 <??("X", 80)>
diff --git a/webcit/wiki.c b/webcit/wiki.c
index 1bdd8c55d..e4d7de44a 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -339,9 +339,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 +353,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 +375,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);
 }
-- 
2.30.2