int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
+ int whichtype;
if ((WCC == NULL) ||
- (TP->Tokens->nParameters < 3) ||
- (TP->Tokens->Params[2]->Type != TYPE_STR)||
- (TP->Tokens->Params[2]->len < 7))
+ (TP->Tokens->nParameters < 3))
return 0;
-
+ whichtype = GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
switch(WCC->CurRoom.view) {
case VIEW_BBS:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
+ return whichtype == VIEW_BBS;
case VIEW_MAILBOX:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
+ return whichtype == VIEW_MAILBOX;
case VIEW_ADDRESSBOOK:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
+ return whichtype == VIEW_ADDRESSBOOK;
case VIEW_TASKS:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
+ return whichtype == VIEW_TASKS;
case VIEW_NOTES:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
+ return whichtype == VIEW_NOTES;
case VIEW_WIKI:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
+ return whichtype == VIEW_WIKI;
case VIEW_JOURNAL:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
+ return whichtype == VIEW_JOURNAL;
case VIEW_CALENDAR:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
+ return whichtype == VIEW_CALENDAR;
case VIEW_CALBRIEF:
- return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
+ return whichtype == VIEW_CALBRIEF;
default:
return 0;
}
REGISTERTokenParamDefine(US_USER_SET);
+ REGISTERTokenParamDefine(VIEW_BBS);
+ REGISTERTokenParamDefine(VIEW_MAILBOX);
+ REGISTERTokenParamDefine(VIEW_ADDRESSBOOK);
+ REGISTERTokenParamDefine(VIEW_CALENDAR);
+ REGISTERTokenParamDefine(VIEW_TASKS);
+ REGISTERTokenParamDefine(VIEW_NOTES);
+ REGISTERTokenParamDefine(VIEW_WIKI);
+ REGISTERTokenParamDefine(VIEW_CALBRIEF);
+ REGISTERTokenParamDefine(VIEW_JOURNAL);
+ REGISTERTokenParamDefine(VIEW_BLOG);
+
RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
<??("COND:BSTR", 4, "edit")><??("COND:BSTR", 5, "sig_inserted", "yes")><?!("COND:PREF", 6, "use_sig", "yes")>
<br><p>-- <br><?PREF:VALUE("signature","H")>
</p>
-<?!("X", 6)><??("X", 5)><?!("X", 4)><?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")><?MAIL:EDITWIKI("X")><?!("X", 7)>
+<?!("X", 6)><??("X", 5)><?!("X", 4)><?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><?MAIL:EDITWIKI("X")><?!("X", 7)>
</textarea>
<div class="room_banner" id="room_banner" >
<?ROOMPIC>
<h1 id="rmname"><?ROOMNAME></h1>
-<?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")>
+<?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")>
<h2><?BSTR("page")></h2>
<?!("X", 7)>
<?ROOMINFO>
-<??("COND:ROOM:TYPE_IS", 8, "VIEW_WIKI")>
+<??("COND:ROOM:TYPE_IS", 8, #"VIEW_WIKI")>
<p id="nummsgs"><?NUMMSGS></p>
<?!("X", 8)>
</div>
onMouseOver=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="visible"
onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden" >
-<??("COND:ROOM:TYPE_IS", 12, "VIEW_WIKI")><!-- skip headers for wiki rooms -->
+<??("COND:ROOM:TYPE_IS", 12, #"VIEW_WIKI")><!-- skip headers for wiki rooms -->
<div class="message_header">
<span><?MAIL:SUMM:DATEFULL></span>
<?_("from ")>
<!-- temporarily disabled for 7.60
<a href="display_enter?edit=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:TO("U")>&cc=<?MAIL:SUMM:CCCC("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>&force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a>
-->
-<?!("COND:ROOM:TYPE_IS", 8, "VIEW_BBS")>
+<?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")>
<a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
<a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>
<?!("X", 8)>
-<??("COND:ROOM:TYPE_IS", 9, "VIEW_BBS")>
+<??("COND:ROOM:TYPE_IS", 9, #"VIEW_BBS")>
<?!("COND:MAIL:SUMM:RFCA", 10)>
<a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a>
<a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>?recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E%2C<?MAIL:SUMM:ALLRCPT("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%20", "Re:")>"><span>[</span><?_("ReplyAll")><span>]</span></a>