From b0e86289246c48fdb7b2f06d583538fb30ad32aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 25 Nov 2008 19:40:35 +0000
Subject: [PATCH] * conditionals mustn't have 0 as id; fix the ones who have
 and add another errormessage.

---
 webcit/static/t/section_mailsummary.html   | 2 +-
 webcit/static/t/section_mailsummary_m.html | 2 +-
 webcit/static/t/whosimplesection.html      | 2 +-
 webcit/subst.c                             | 9 +++++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/webcit/static/t/section_mailsummary.html b/webcit/static/t/section_mailsummary.html
index 048561665..15e0fef87 100644
--- a/webcit/static/t/section_mailsummary.html
+++ b/webcit/static/t/section_mailsummary.html
@@ -1,4 +1,4 @@
-<tr id="m<?MAIL:SUMM:N>" style="font-weight:<?%("COND:MAIL:SUMM:UNREAD", 0, 0, 0, "bold", "normal")>" onMouseDown="CtdlMoveMsgMouseDown(event,<?MAIL:SUMM:N>)">
+<tr id="m<?MAIL:SUMM:N>" style="font-weight:<?%("COND:MAIL:SUMM:UNREAD", 1, 0, 0, "bold", "normal")>" onMouseDown="CtdlMoveMsgMouseDown(event,<?MAIL:SUMM:N>)">
 <td width=50%><?MAIL:SUMM:SUBJECT("X")></td>
 <td width=30%><?MAIL:SUMM:FROM("X")></td>
 <td width=20%><?MAIL:SUMM:DATESTR></td>
diff --git a/webcit/static/t/section_mailsummary_m.html b/webcit/static/t/section_mailsummary_m.html
index 761508f4f..8b96757ce 100644
--- a/webcit/static/t/section_mailsummary_m.html
+++ b/webcit/static/t/section_mailsummary_m.html
@@ -1,4 +1,4 @@
-<div><div id="m<?MAIL:SUMM:N>" style="font-weight:<?%("COND:MAIL:SUMM:UNREAD", 0, 0, 0, "bold", "normal")>;" onClick="CtdlLoadMsgMouseDown(event,<?MAIL:SUMM:N>)">
+<div><div id="m<?MAIL:SUMM:N>" style="font-weight:<?%("COND:MAIL:SUMM:UNREAD", 1, 0, 0, "bold", "normal")>;" onClick="CtdlLoadMsgMouseDown(event,<?MAIL:SUMM:N>)">
 <span class="from"><?MAIL:SUMM:FROM("X")></span>
 <span style="float: right;"><?MAIL:SUMM:DATESTR></span><br/>
 <span class="subject"><?MAIL:SUMM:SUBJECT("X")></span>
diff --git a/webcit/static/t/whosimplesection.html b/webcit/static/t/whosimplesection.html
index 387546821..8161f4d1c 100644
--- a/webcit/static/t/whosimplesection.html
+++ b/webcit/static/t/whosimplesection.html
@@ -1 +1 @@
-<li class="<??("WHO:IDLE", 4, )>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("U")></a></li>
+<li class="<??("WHO:IDLE", 4)>activeuser<?!("X", 4)><?!("COND:SUBST", 5, "WHO:IDLE")>inactiveuser<?!("X", 5)>"><a href='showuser?who=<?WHO:NAME("U")>'><?WHO:NAME("U")></a></li>
diff --git a/webcit/subst.c b/webcit/subst.c
index 05f03c6b9..ca532a469 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -934,6 +934,15 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 	case SV_CUST_STR_CONDITIONAL:
 	case SV_CONDITIONAL:
 	case SV_NEG_CONDITIONAL:
+		if (NewToken->Params[1]->lvalue == 0) {
+			lprintf(1, "Conditional (in '%s' line %ld); "
+				"Conditional ID mustn't be 0! [%s]\n", 
+				ChrPtr(pTmpl->FileName),
+				NewToken->Line,
+				ChrPtr(NewToken->FlatToken));
+			NewToken->Flags = 0;
+			break;
+		}
 		if (NewToken->nParameters <2) {
 			lprintf(1, "Conditional (in '%s' line %ld); "
 				"require at least 2 parameters, you gave %ld params [%s]\n", 
-- 
2.39.2