* switch room types to defines; no strcmp needed anymore.

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 5d1aa8eccef8139f87b8e6ebf81b7fb69c1a4ac7..761b43956a8b966fdcdb24b120e9c54169e9ed53 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3195,32 +3195,31 @@ int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 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;
        }
@@ -3313,6 +3312,17 @@ InitModule_ROOMOPS
        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);
 

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 08b67a43a6f6086f9669d900eb7b2da73260b396..5d2f13416789db260148c36a7193e55901fdffb7 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -103,7 +103,7 @@
 <??("COND:BSTR", 4, "edit")><??("COND:BSTR", 5, "sig_inserted", "yes")><?!("COND:PREF", 6, "use_sig", "yes")>
 &lt;br&gt;&lt;p&gt;--&nbsp;&lt;br&gt;<?PREF:VALUE("signature","H")>
       &lt;/p&gt;
-<?!("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>
 
 

diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index a4ade026a067d7fed75abfe607d7530c57c08e26..6373fbc8e961d07749e77dca9225e326d58dab48 100644 (file)
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -3,11 +3,11 @@
 <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>

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 603b3852e57a60c2d2541f23a518a46720ef7ea9..7d7b5d9eac3afff1158913bddc0073a33030cded 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -2,7 +2,7 @@
 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 ")>
@@ -19,11 +19,11 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <!-- 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>