* Removed the last instance if is_room_aide
authorArt Cancro <ajc@citadel.org>
Thu, 15 Jul 2010 16:59:03 +0000 (16:59 +0000)
committerArt Cancro <ajc@citadel.org>
Thu, 15 Jul 2010 16:59:03 +0000 (16:59 +0000)
webcit/roomops.c

index 5b9840cc6b0f4c2a01447ff54ea2b303ea93fcc5..1ab8c8efa93c78d806753c139916f500ac048145 100644 (file)
@@ -845,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, '|');
 
@@ -2631,10 +2632,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 */
+       }
 
 }