ICAL: add conflict handling

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 301d83c5f55e00453403af932803054e9ee8cdbd..0c3eaa21d1867131f99fd479a896d00dc290d130 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1007,6 +1007,7 @@ void change_view(void) {
  * Set the message expire policy for this room and/or floor
  */
 void set_room_policy(void) {
+       StrBuf *Line;
 
        if (!havebstr("ok_button")) {
                AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
@@ -1016,7 +1017,7 @@ void set_room_policy(void) {
                return;
        }
 
-       StrBuf *Line = NewStrBuf();
+       Line = NewStrBuf();
 
        serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
        StrBuf_ServGetln(Line);
@@ -1368,6 +1369,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(UA_POSTALLOWED);
        REGISTERTokenParamDefine(UA_ADMINALLOWED);
        REGISTERTokenParamDefine(UA_DELETEALLOWED);
+       REGISTERTokenParamDefine(UA_REPLYALLOWED);
        REGISTERTokenParamDefine(UA_ISTRASH);
 
        REGISTERTokenParamDefine(US_NEEDVALID);
@@ -1395,6 +1397,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(VIEW_CALBRIEF);
        REGISTERTokenParamDefine(VIEW_JOURNAL);
        REGISTERTokenParamDefine(VIEW_BLOG);
+       REGISTERTokenParamDefine(VIEW_QUEUE);
 
        /* GNET types: */
        /* server internal, we need to know but ignore them. */