* add New Tokens & conditionals for extended room attributes:

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index e15b0c47e65069a16f79f90760f42bddfad28e34..4dbab03224fad5fecb02ca67e4858a6fb5b885c1 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -16,6 +16,7 @@ char *viewdefs[9];                    /* the different kinds of available views */
  */
 
 void display_whok(void);
+int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP);
 
 /*
  * Initialize the viewdefs with localized strings
@@ -844,8 +845,9 @@ void ParseGoto(folder *room, StrBuf *Line)
        room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
 
        flag = StrBufExtractNext_long(Line, &Pos, '|');
-       if (WCC->is_aide || flag)
+       if (WCC->is_aide || flag) {
                room->RAFlags |= UA_ADMINALLOWED;
+       }
 
        room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
 
@@ -896,6 +898,151 @@ void ParseGoto(folder *room, StrBuf *Line)
        room->Floor = (const Floor*) vFloor;
 }
 
+void LoadRoomAide(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       
+       if (WCC->CurRoom.RoomAideLoaded)
+               return;
+
+       WCC->CurRoom.RoomAideLoaded = 1;
+       Buf = NewStrBuf();
+       serv_puts("GETA");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               FlushStrBuf(WCC->CurRoom.RoomAide);
+               AppendImportantMessage (ChrPtr(Buf) + 4, 
+                                       StrLength(Buf) - 4);
+       } else {
+               const char *Pos;
+
+               Pos = ChrPtr(Buf) + 4;
+
+               FreeStrBuf(&WCC->CurRoom.RoomAide);
+               WCC->CurRoom.RoomAide = NewStrBufPlain (NULL, StrLength (Buf));
+
+               StrBufExtract_NextToken(WCC->CurRoom.RoomAide, Buf, &Pos, '|'); 
+       }
+       FreeStrBuf (&Buf);
+}
+
+void tmplput_CurrentRoomAide(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomAide();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.RoomAide, 0);
+}
+
+
+void LoadRoomXA (void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       
+       if (WCC->CurRoom.XALoaded)
+               return;
+
+       WCC->CurRoom.XALoaded = 1;
+       Buf = NewStrBuf();
+       serv_puts("GETA");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               FlushStrBuf(WCC->CurRoom.XAPass);
+               FlushStrBuf(WCC->CurRoom.Directory);
+
+               AppendImportantMessage (ChrPtr(Buf) + 4, 
+                                       StrLength(Buf) - 4);
+       } else {
+               const char *Pos;
+
+               Pos = ChrPtr(Buf) + 4;
+
+               FreeStrBuf(&WCC->CurRoom.XAPass);
+               FreeStrBuf(&WCC->CurRoom.Directory);
+
+               WCC->CurRoom.XAPass = NewStrBufPlain (NULL, StrLength (Buf));
+               WCC->CurRoom.Directory = NewStrBufPlain (NULL, StrLength (Buf));
+
+               StrBufSkip_NTokenS(Buf, &Pos, '|', 1); /* The Name, we already know... */
+               StrBufExtract_NextToken(WCC->CurRoom.XAPass, Buf, &Pos, '|'); 
+               StrBufExtract_NextToken(WCC->CurRoom.Directory, Buf, &Pos, '|'); 
+               StrBufSkip_NTokenS(Buf, &Pos, '|', 2); /* QRFlags, FloorNum we already know... */
+               WCC->CurRoom.Order = StrBufExtractNext_long(Buf, &Pos, '|');
+               WCC->CurRoom.DefView = StrBufExtractNext_long(Buf, &Pos, '|');
+               /* QR2Flags, we already know them... */
+
+       }
+       FreeStrBuf (&Buf);
+}
+
+void tmplput_CurrentRoomPass(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 0);
+}
+void tmplput_CurrentRoomDirectory(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.Directory, 0);
+}
+void tmplput_CurrentRoomOrder(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.Order);
+}
+void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.DefView);
+}
+
+
+int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+
+       if (WCC == NULL)
+               return 0;
+
+       LoadRoomXA();
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.Order;
+}
+
+int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+
+       if (WCC == NULL)
+               return 0;
+
+       LoadRoomXA();
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.DefView;
+}
+
+
+
+
 
 /*
  * goto next room
@@ -1114,7 +1261,7 @@ void display_editroom(void)
        wc_printf("</td>\n");
        wc_printf("<td>&nbsp;</td>\n");
 
-       if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
+       if ( ConditionalHaveRoomeditRights(NULL, NULL)) {
 
                wc_printf("<td class=\"");
                if (!strcmp(tab, "config")) {
@@ -2630,10 +2777,11 @@ void entroom(void)
        serv_getln(buf, sizeof buf);
        WCC->CurRoom.view = er_view;
 
-       if (WCC->is_aide || WCC->is_room_aide)
+       if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
                display_editroom ();
-       else 
+       } else {
                do_change_view(er_view);                /* Now go there */
+       }
 
 }
 
@@ -3119,14 +3267,15 @@ void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
 int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
-       return (WCC != NULL)? (WCC->is_room_aide == 0) : 0;
+       return (WCC != NULL)? 
+               ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
 }
 
 int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
        return (WCC == NULL)? 0 : 
-               ( (WCC->is_room_aide) || /////TODO!
+               ( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
                   (WCC->CurRoom.is_inbox) || 
                   (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
 }
@@ -3200,7 +3349,7 @@ int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 
        return ( (WCC!= NULL) && 
                 ((WCC->axlevel >= 6) || 
-                 (WCC->is_room_aide) || 
+                 ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
                  (WCC->CurRoom.is_inbox) ));
 }
 
@@ -3254,6 +3403,17 @@ InitModule_ROOMOPS
        RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalCurrentRoomHas_QRFlag2, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
 
+       RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_CurrentRoomAide, NULL, CTX_NONE);
+
+
+       RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_CurrentRoomPass, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:ORDER", 0, 0, tmplput_CurrentRoomOrder, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
+
+
        REGISTERTokenParamDefine(QR_PERMANENT);
        REGISTERTokenParamDefine(QR_INUSE);
        REGISTERTokenParamDefine(QR_PRIVATE);