From 7399410f19f5bff3d02e5cea222dd0c5bd4328b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sat, 27 Feb 2010 12:11:55 +0000 Subject: [PATCH] * switch room types to defines; no strcmp needed anymore. --- webcit/roomops.c | 36 ++++++++++++++++++++----------- webcit/static/t/edit_message.html | 2 +- webcit/static/t/roombanner.html | 4 ++-- webcit/static/t/view_message.html | 6 +++--- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/webcit/roomops.c b/webcit/roomops.c index 5d1aa8ecc..761b43956 100644 --- 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 08b67a43a..5d2f13416 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -103,7 +103,7 @@ <br><p>-- <br> </p> - + diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html index a4ade026a..6373fbc8e 100644 --- a/webcit/static/t/roombanner.html +++ b/webcit/static/t/roombanner.html @@ -3,11 +3,11 @@

- +

- +

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html index 603b3852e..7d7b5d9ea 100644 --- a/webcit/static/t/view_message.html +++ b/webcit/static/t/view_message.html @@ -2,7 +2,7 @@ onMouseOver=document.getElementById("msg").style.visibility="visible" onMouseOut=document.getElementById("msg").style.visibility="hidden" > - +
@@ -19,11 +19,11 @@ onMouseOut=document.getElementById("msg").style.visibility="hidden - + %7C?subject=">[] %7C?replyquote=&recp=%22%22%3C%3E?subject=">[] - + %7C?replyquote=?recp=%22%22%3C%3E?subject=">[] %7C?replyquote=?recp=%22%22%3C%3E%2C?subject=">[] -- 2.30.2