* remove the now unneccesary stuff from embed_room_banner()
[citadel.git] / webcit / roomops.c
index 7531b59239b23eec45ee919e22b53b00739388d0..a5243ebca34eea84ba6fba10c769e203ef2558f0 100644 (file)
@@ -9,27 +9,44 @@
 
 char floorlist[MAX_FLOORS][SIZ];       /* list of our floor names */
 
-char *viewdefs[9];                     /* the different kinds of available views */
-
 /* See GetFloorListHash and GetRoomListHash for info on these.
  * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
  */
 
 void display_whok(void);
+int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP);
+
+
+char *viewdefs[VIEW_MAX];                      /* the different kinds of available views */
+
+ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {  /* the different kinds of available views for a view */
+{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_ADDRESSBOOK, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX /*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_TASKS, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_NOTES, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_WIKI, VIEW_MAX, VIEW_MAX, VIEW_MAX}, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX/*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX},
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_JOURNAL, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_BLOG }, 
+       };
+/* the brief calendar view is disabled: VIEW_CALBRIEF */
 
 /*
  * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
-       viewdefs[0] = _("Bulletin Board");
-       viewdefs[1] = _("Mail Folder");
-       viewdefs[2] = _("Address Book");
-       viewdefs[3] = _("Calendar");
-       viewdefs[4] = _("Task List");
-       viewdefs[5] = _("Notes List");
-       viewdefs[6] = _("Wiki");
-       viewdefs[7] = _("Calendar List");
-       viewdefs[8] = _("Journal");
+       viewdefs[VIEW_BBS] = _("Bulletin Board");
+       viewdefs[VIEW_MAILBOX] = _("Mail Folder");
+       viewdefs[VIEW_ADDRESSBOOK] = _("Address Book");
+       viewdefs[VIEW_CALENDAR] = _("Calendar");
+       viewdefs[VIEW_TASKS] = _("Task List");
+       viewdefs[VIEW_NOTES] = _("Notes List");
+       viewdefs[VIEW_WIKI] = _("Wiki");
+       viewdefs[VIEW_CALBRIEF] = _("Calendar List");
+       viewdefs[VIEW_JOURNAL] = _("Journal");
+       viewdefs[VIEW_BLOG] = _("Blog");
 }
 
 /*
@@ -230,112 +247,6 @@ void zapped_list(void)
        wDumpContent(1);
 }
 
-
-/*
- * read this room's info file (set v to 1 for verbose mode)
- */
-void readinfo(StrBuf *Target, WCTemplputParams *TP)
-{
-       char buf[256];
-       char briefinfo[128];
-       char fullinfo[8192];
-       int fullinfo_len = 0;
-
-       serv_puts("RINF");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       if (fullinfo_len < (sizeof fullinfo - sizeof buf)) {
-                               strcpy(&fullinfo[fullinfo_len], buf);
-                               fullinfo_len += strlen(buf);
-                       }
-               }
-
-               safestrncpy(briefinfo, fullinfo, sizeof briefinfo);
-               strcpy(&briefinfo[50], "...");
-
-                wc_printf("<div class=\"infos\" "
-                       "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
-                       ">"
-               );
-               escputs(briefinfo);
-                wc_printf("</div><div id=\"room_infos\" style=\"display:none;\">");
-               wc_printf("<img class=\"close_infos\" "
-                       "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
-                       "src=\"static/closewindow.gif\" alt=\"%s\"  width=\"16\" height=\"16\">",
-                       _("Close window")
-               );
-               escputs(fullinfo);
-                wc_printf("</div>");
-       }
-       else {
-               wc_printf("&nbsp;");
-       }
-}
-
-
-
-
-/*
- * Display room banner icon.  
- * The server doesn't actually need the room name, but we supply it in
- * order to keep the browser from using a cached icon from another room.
- */
-void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
-{
-       char buf[SIZ];
-
-       serv_puts("OIMG _roompic_");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '2') {
-               wc_printf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
-               urlescputs(ChrPtr(WC->wc_roomname));
-               wc_printf("\">");
-               serv_puts("CLOS");
-               serv_getln(buf, sizeof buf);
-       }
-       else if (WC->wc_view == VIEW_ADDRESSBOOK) {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/viewcontacts_48x.gif"
-                       "\" >"
-                       );
-       }
-       else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/calarea_48x.gif"
-                       "\" width=\"48\" height=\"48\">"
-                       );
-       }
-       else if (WC->wc_view == VIEW_TASKS) {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/taskmanag_48x.gif"
-                       "\" width=\"48\" height=\"48\">"
-                       );
-       }
-       else if (WC->wc_view == VIEW_NOTES) {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/storenotes_48x.gif"
-                       "\" width=\"48\" height=\"48\">"
-                       );
-       }
-       else if (WC->wc_view == VIEW_MAILBOX) {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/privatemess_48x.gif"
-                       "\" width=\"48\" height=\"48\">"
-                       );
-       }
-       else {
-               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
-                       "static/chatrooms_48x.gif"
-                       "\" width=\"48\" height=\"48\">"
-                       );
-       }
-
-}
-
-
-
 /*
  * Display the current view and offer an option to change it
  */
@@ -360,15 +271,15 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
                 * view in a non-Calendar room.
                 */
                if (
-                       (i == WC->wc_view)
-                       ||      (i == WC->wc_default_view)                      /* default */
-                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /* mail or bulletin */
-                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /* mail or bulletin */
-                       /* ||   ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
+                       (i == WC->CurRoom.view)
+                       ||      (i == WC->CurRoom.defview)                      /* default */
+                       ||      ( (i == 0) && (WC->CurRoom.defview == 1) )      /* mail or bulletin */
+                       ||      ( (i == 1) && (WC->CurRoom.defview == 0) )      /* mail or bulletin */
+                       /* ||   ( (i == 7) && (WC->CurRoom.defview == 3) )      (calendar list temporarily disabled) */
                        ) {
 
                        wc_printf("<option %s value=\"changeview?view=%d\">",
-                               ((i == WC->wc_view) ? "selected" : ""),
+                               ((i == WC->CurRoom.view) ? "selected" : ""),
                                i );
                        escputs(viewdefs[i]);
                        wc_printf("</option>\n");
@@ -378,22 +289,6 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-/*
- * Display a search box
- */
-void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
-{
-       wc_printf("<form name=\"searchomatic\" action=\"do_search\">\n");
-       wc_printf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wc_printf("<label for=\"srchquery\">");
-       wc_printf(_("Search: "));
-       wc_printf("</label><input ");
-       wc_printf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
-       wc_printf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
-               );
-       wc_printf("</div></form>\n");
-}
-
 
 /*
  * Embed the room banner
@@ -417,16 +312,16 @@ void embed_room_banner(char *got, int navbar_style) {
        if (got == NULL) {
                memset(buf, '0', 20);
                buf[20] = '\0';
-               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
+               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
                serv_getln(buf, sizeof buf);
                got = buf;
        }
 
        /* The browser needs some information for its own use */
        wc_printf("<script type=\"text/javascript\">    \n"
-               "       room_is_trash = %d;             \n"
-               "</script>\n",
-               WC->wc_is_trash
+                 "     room_is_trash = %d;             \n"
+                 "</script>\n",
+                 ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
        );
 
        /*
@@ -439,43 +334,16 @@ void embed_room_banner(char *got, int navbar_style) {
        }
        StrBufPrintf(WCC->Hdr->this_page, 
                     "dotskip?room=%s",
-                    ChrPtr(WC->wc_roomname)
+                    ChrPtr(WC->CurRoom.name)
        );
 
        /* Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
-       WC->wc_view = extract_int(&got[4], 11);
+       WC->CurRoom.view = extract_int(&got[4], 11);
 
-       /* Is this a directory room and does it contain files and how many? */
-       if ((WC->room_flags & QR_DIRECTORY) && (WC->room_flags & QR_VISDIR))
-       {
-               serv_puts("RDIR");
-               serv_getln(buf2, sizeof buf2);
-               if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
-                                           file_count++;
-               snprintf (with_files, sizeof with_files, 
-                         "; <a href=\"do_template?template=files\"> %d %s </a>", 
-                         file_count, 
-                         ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
-       }
-       else
-               strcpy (with_files, "");
-       
-       svprintf(HKEY("NUMMSGS"), WCS_STRING,
-                _("%d new of %d messages%s"),
-                extract_int(&got[4], 1),
-                extract_int(&got[4], 2),
-                with_files
-               );
-       svcallback("ROOMPIC", embed_room_graphic);
-       svcallback("ROOMINFO", readinfo);
-       svcallback("VIEWOMATIC", embed_view_o_matic); 
-       svcallback("SEARCHOMATIC", embed_search_o_matic);
-       svcallback("START", offer_start_page); 
        do_template("roombanner", NULL);
        /* roombanner contains this for mobile */
-       if (navbar_style != navbar_none && !WC->is_mobile) { 
+       if (navbar_style != navbar_none && (WC->is_mobile < 1)) { 
 
                wc_printf("<div id=\"navbar\"><ul>");
 
@@ -487,7 +355,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "</li>\n", _("Ungoto")
                        );
 
-               if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
+               if ( (navbar_style == navbar_default) && (WC->CurRoom.view == VIEW_BBS) ) {
                        wc_printf(
                                "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
@@ -498,7 +366,7 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       switch(WC->wc_view) {
+                       switch(WC->CurRoom.view) {
                        case VIEW_ADDRESSBOOK:
                                wc_printf(
                                        "<li class=\"viewcontacts\">"
@@ -600,7 +468,7 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       switch(WC->wc_view) {
+                       switch(WC->CurRoom.view) {
                        case VIEW_ADDRESSBOOK:
                                wc_printf(
                                        "<li class=\"addnewcontact\">"
@@ -656,7 +524,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                str_wiki_index(buf);
                                wc_printf(
                                        "<li class=\"newmess\">"
-                                       "<a href=\"display_enter?wikipage=%s\">"
+                                       "<a href=\"display_enter?page=%s\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
                                        "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
@@ -757,13 +625,14 @@ void embed_room_banner(char *got, int navbar_style) {
  */
 long gotoroom(const StrBuf *gname)
 {
+       wcsession *WCC = WC;
        StrBuf *Buf;
        static long ls = (-1L);
        long err = 0;
 
        /* store ungoto information */
-       strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
-       WC->uglsn = ls;
+       strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+       WCC->uglsn = ls;
        Buf = NewStrBuf();
 
        /* move to the new room */
@@ -782,32 +651,9 @@ long gotoroom(const StrBuf *gname)
                        return err;
                }
        }
+       ParseGoto(&WCC->CurRoom, Buf);
 
-       if (WC->wc_roomname == NULL)
-               WC->wc_roomname = NewStrBuf();
-       else
-               FlushStrBuf(WC->wc_roomname);
-
-       StrBufExtract_token(WC->wc_roomname, Buf, 0, '|');
-       StrBufCutLeft(WC->wc_roomname, 4);
-       WC->room_flags = StrBufExtract_int(Buf, 4, '|');
-       /* highest_msg_read = extract_int(&buf[4],6);
-          maxmsgnum = extract_int(&buf[4],5);
-       */
-       WC->is_mailbox = StrBufExtract_int(Buf, 7, '|');   
-       ls = StrBufExtract_long(Buf, 6, '|');
-       WC->wc_floor = StrBufExtract_int(Buf, 10, '|');
-       WC->wc_view = StrBufExtract_int(Buf, 11, '|');
-       WC->wc_default_view = StrBufExtract_int(Buf, 12, '|');
-       WC->wc_is_trash = StrBufExtract_int(Buf, 13, '|');
-       WC->room_flags2 = StrBufExtract_int(Buf, 14, '|');
-
-       if (WC->is_aide)
-               WC->is_room_aide = WC->is_aide;
-       else
-               WC->is_room_aide = (char) StrBufExtract_int(Buf, 8, '|');
-
-       remove_march(WC->wc_roomname);
+       remove_march(WCC->CurRoom.name);
        if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
                remove_march(gname);
        FreeStrBuf(&Buf);
@@ -816,12 +662,479 @@ long gotoroom(const StrBuf *gname)
 }
 
 
+void ParseGoto(folder *room, StrBuf *Line)
+{
+       wcsession *WCC = WC;
+       const char *Pos;
+       int flag;
+       void *vFloor = NULL;
+       StrBuf *pBuf;
+
+       if (StrLength(Line) < 4) {
+               return;
+       }
+       
+       /* ignore the commandstate... */
+       Pos = ChrPtr(Line) + 4;
+
+       if (room->RoomNameParts != NULL)
+       {
+               int i;
+               for (i=0; i < room->nRoomNameParts; i++)
+                       FreeStrBuf(&room->RoomNameParts[i]);
+               free(room->RoomNameParts);
+               room->RoomNameParts = NULL;
+       }
+
+       pBuf = room->name;  
+       if (pBuf == NULL)
+               pBuf = NewStrBufPlain(NULL, StrLength(Line));
+       else
+               FlushStrBuf(pBuf);
+       memset(room, 0, sizeof(folder));
+       room->name = pBuf;
+
+       StrBufExtract_NextToken(room->name, Line, &Pos, '|'); // WC->CurRoom->name
+
+       room->nNewMessages = StrBufExtractNext_long(Line, &Pos, '|'); 
+       if (room->nNewMessages > 0)
+               room->RAFlags |= UA_HASNEWMSGS;
+
+       room->nTotalMessages = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->ShowInfo =  StrBufExtractNext_long(Line, &Pos, '|');
+       
+       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
+
+       room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
+       room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
+
+       flag = StrBufExtractNext_long(Line, &Pos, '|');
+       if (WCC->is_aide || flag) {
+               room->RAFlags |= UA_ADMINALLOWED;
+       }
+
+       room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->floorid = StrBufExtractNext_int(Line, &Pos, '|'); // wc_floor
+
+       room->view = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->view
+
+       room->defview = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->defview
+
+       flag = StrBufExtractNext_long(Line, &Pos, '|');
+       if (flag)
+               room->RAFlags |= UA_ISTRASH; // wc_is_trash
+
+       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+
+       /* find out, whether we are in a sub-room */
+       room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
+       if (room->nRoomNameParts > 1)
+       {
+               int i;
+               
+               Pos = NULL;
+               room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+               memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+               for (i=0; i < room->nRoomNameParts; i++)
+               {
+                       room->RoomNameParts[i] = NewStrBuf();
+                       StrBufExtract_NextToken(room->RoomNameParts[i],
+                                               room->name, &Pos, '\\');
+               }
+       }
+
+       /* Private mailboxes on the main floor get remapped to the personal folder */
+       if ((room->QRFlags & QR_MAILBOX) && 
+           (room->floorid == 0))
+       {
+               room->floorid = VIRTUAL_MY_FLOOR;
+               if ((room->nRoomNameParts == 1) && 
+                   (StrLength(room->name) == 4) && 
+                   (strcmp(ChrPtr(room->name), "Mail") == 0))
+               {
+                       room->is_inbox = 1;
+               }
+               
+       }
+       /* get a pointer to the floor we're on: */
+       if (WCC->Floors == NULL)
+               GetFloorListHash(NULL, NULL);
+
+       GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+       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_CurrentRoomFloorName(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+       folder *Folder = &WCC->CurRoom;
+       const Floor *pFloor = Folder->Floor;
+
+       if (pFloor == NULL)
+               return;
+
+       StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
+}
+
+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, '|');
+               /* defview, we already know you. */
+               /* QR2Flags, we already know them... */
+
+       }
+       FreeStrBuf (&Buf);
+}
+
+
+void LoadXRoomPic(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       
+       if (WCC->CurRoom.XHaveRoomPicLoaded)
+               return;
+
+       WCC->CurRoom.XHaveRoomPicLoaded = 1;
+       Buf = NewStrBuf();
+       serv_puts("OIMG _roompic_");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               WCC->CurRoom.XHaveRoomPic = 0;
+       } else {
+               WCC->CurRoom.XHaveRoomPic = 1;
+       }
+       serv_puts("CLOS");
+       StrBuf_ServGetln(Buf);
+       GetServerStatus(Buf, NULL);
+       FreeStrBuf (&Buf);
+}
+
+int ConditionalThisRoomXHavePic(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       if (WCC == NULL)
+               return 0;
+
+       LoadXRoomPic();
+       return WCC->CurRoom.XHaveRoomPic == 1;
+}
+
+void LoadXRoomInfoText(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       int Done = 0;
+       
+       if (WCC->CurRoom.XHaveInfoTextLoaded)
+               return;
+
+       WCC->CurRoom.XHaveInfoTextLoaded = 1;
+       Buf = NewStrBuf();
+
+       serv_puts("RINF");
+
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 1) {
+               WCC->CurRoom.XInfoText = NewStrBuf ();
+               
+               while (!Done && StrBuf_ServGetln(Buf)>=0) {
+                       if ( (StrLength(Buf)==3) && 
+                            !strcmp(ChrPtr(Buf), "000")) 
+                               Done = 1;
+                       else 
+                               StrBufAppendBuf(WCC->CurRoom.XInfoText, Buf, 0);
+               }
+       }
+
+       FreeStrBuf (&Buf);
+}
+
+int ConditionalThisRoomXHaveInfoText(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       if (WCC == NULL)
+               return 0;
+
+       LoadXRoomInfoText();
+       return (StrLength(WCC->CurRoom.XInfoText)>0);
+}
+
+void tmplput_CurrentRoomInfoText(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadXRoomInfoText();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 1);
+}
+
+void LoadXRoomXCountFiles(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       int Done = 0;
+       
+       if (WCC->CurRoom.XHaveDownloadCount)
+               return;
+
+       WCC->CurRoom.XHaveDownloadCount = 1;
+
+       Buf = NewStrBuf();
+       serv_puts("RDIR");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 1) {
+               
+               while (!Done && StrBuf_ServGetln(Buf)>=0) {
+                       if ( (StrLength(Buf)==3) && 
+                            !strcmp(ChrPtr(Buf), "000")) 
+                               Done = 1;
+                       else 
+                               WCC->CurRoom.XDownloadCount++;
+               }
+       }
+
+       FreeStrBuf (&Buf);
+}
+
+void tmplput_CurrentRoomXNFiles(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadXRoomXCountFiles();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.XDownloadCount);
+}
+
+void tmplput_CurrentRoomX_FileString(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadXRoomXCountFiles();
+
+       if (WCC->CurRoom.XDownloadCount == 1)
+               StrBufAppendBufPlain(Target, _("file"), -1, 0);
+       else
+               StrBufAppendBufPlain(Target, _("files"), -1, 0);
+}
+
+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;
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.defview);
+}
+
+void tmplput_CurrentRoom_nNewMessages(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nNewMessages);
+}
+
+void tmplput_CurrentRoom_nTotalMessages(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nTotalMessages);
+}
+
+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;
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.defview;
+}
+
+int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+       
+       if (WCC == NULL)
+               return 0;
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                CheckThis);
+               return 0;
+       }
+
+       return exchangeable_views [WCC->CurRoom.defview][CheckThis] != VIEW_MAX;
+}
+
+void tmplput_CurrentRoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+
+       if ((WCC == NULL) ||
+           (WCC->CurRoom.defview >= VIEW_MAX) || 
+           (WCC->CurRoom.defview < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Token", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                (WCC != NULL)? 
+                                WCC->CurRoom.defview : -1);
+               return;
+       }
+
+       Buf = NewStrBufPlain(_(viewdefs[WCC->CurRoom.defview]), -1);
+       StrBufAppendTemplate(Target, TP, Buf, 0);
+       FreeStrBuf(&Buf);
+}
+
+void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
+       long CheckThis;
+       StrBuf *Buf;
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 0, 0);
+       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Token", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                CheckThis);
+               return;
+       }
+
+       Buf = NewStrBufPlain(_(viewdefs[CheckThis]), -1);
+       StrBufAppendTemplate(Target, TP, Buf, 0);
+       FreeStrBuf(&Buf);
+}
+
+
 /*
  * goto next room
  */
 void smart_goto(const StrBuf *next_room) {
        gotoroom(next_room);
-       readloop(readnew);
+       readloop(readnew, eUseDefault);
 }
 
 
@@ -993,7 +1306,7 @@ void display_editroom(void)
        int i, j;
        char *tab;
        char *shared_with;
-       char *not_shared_with;
+       char *not_shared_with = NULL;
        int roompolicy = 0;
        int roomvalue = 0;
        int floorpolicy = 0;
@@ -1033,7 +1346,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")) {
@@ -1136,7 +1449,7 @@ void display_editroom(void)
                wc_printf(_("Delete this room"));
                wc_printf("</a>\n"
                        "<li><a href=\"display_editroompic?which_room=");
-               urlescputs(ChrPtr(WC->wc_roomname));
+               urlescputs(ChrPtr(WC->CurRoom.name));
                wc_printf("\">\n");
                wc_printf(_("Set or change the icon for this room's banner"));
                wc_printf("</a>\n"
@@ -1173,7 +1486,7 @@ void display_editroom(void)
                
                        wc_printf("<ul><li>");
                        wc_printf(_("Name of room: "));
-                       wc_printf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+                       wc_printf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\""ULONG_FMT"\">\n",
                                er_name,
                                (sizeof(er_name)-1)
                                );
@@ -1538,6 +1851,9 @@ void display_editroom(void)
                wc_printf("</div>");
        }
 
+       if (not_shared_with != NULL)
+               free (not_shared_with);
+
        /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
                room_states RoomFlags;
@@ -1560,7 +1876,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line=listrecp|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));
@@ -1590,7 +1906,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line="
                                                "digestrecp|");
                                        urlescputs(recp);
                                        wc_printf("\">");
@@ -1690,7 +2006,7 @@ void display_editroom(void)
                        wc_printf("<tr><td>");
                        wc_printf(_("Message expire policy for this room"));
                        wc_printf("<br />(");
-                       escputs(ChrPtr(WC->wc_roomname));
+                       escputs(ChrPtr(WC->CurRoom.name));
                        wc_printf(")</td><td>");
                        wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
                                ((roompolicy == 0) ? "CHECKED" : "") );
@@ -1717,7 +2033,7 @@ void display_editroom(void)
                                wc_printf("<tr><td>");
                                wc_printf(_("Message expire policy for this floor"));
                                wc_printf("<br />(");
-                               escputs(floorlist[WC->wc_floor]);
+                               escputs(floorlist[WC->CurRoom.floorid]);
                                wc_printf(")</td><td>");
                                wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
                                        ((floorpolicy == 0) ? "CHECKED" : "") );
@@ -1814,7 +2130,7 @@ void display_editroom(void)
                                        wc_printf("<td>%ld</td>", extract_long(buf, 5));        /* Fetching interval */
                        
                                        wc_printf("<td class=\"button_link\">");
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=pop3client|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));
@@ -1881,7 +2197,7 @@ void display_editroom(void)
                                        wc_printf("</td>");
 
                                        wc_printf("<td class=\"button_link\">");
-                                       wc_printf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=rssclient|");
                                        urlescputs(recp);
                                        wc_printf("\">");
                                        wc_printf(_("(remove)"));
@@ -2499,6 +2815,7 @@ void entroom(void)
        int er_floor;
        int er_num_type;
        int er_view;
+       wcsession *WCC = WC;
 
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
@@ -2532,16 +2849,25 @@ void entroom(void)
 
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+               strcpy(WCC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
-       /** TODO: Room created, now udate the left hand icon bar for this user */
+       /** TODO: Room created, now update the left hand icon bar for this user */
        burn_folder_cache(0);   /* burn the old folder cache */
        
-       
        gotoroom(er_name);
-       do_change_view(er_view);                /* Now go there */
+
+       serv_printf("VIEW %d", er_view);
+       serv_getln(buf, sizeof buf);
+       WCC->CurRoom.view = er_view;
+
+       if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
+               display_editroom ();
+       } else {
+               do_change_view(er_view);                /* Now go there */
+       }
+
 }
 
 
@@ -2614,7 +2940,7 @@ void goto_private(void)
                display_main_menu();
                return;
        }
-       strcpy(hold_rm, ChrPtr(WC->wc_roomname));
+       strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
        serv_printf("GOTO %s|%s",
                    bstr("gr_name"),
                    bstr("gr_pass"));
@@ -2652,7 +2978,7 @@ void display_zap(void)
 
        wc_printf(_("If you select this option, <em>%s</em> will "
                  "disappear from your room list.  Is this what you wish "
-                 "to do?<br />\n"), ChrPtr(WC->wc_roomname));
+                 "to do?<br />\n"), ChrPtr(WC->CurRoom.name));
 
        wc_printf("<form method=\"POST\" action=\"zap\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -2676,10 +3002,10 @@ void zap(void)
         * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
-       final_destination = NewStrBufDup(WC->wc_roomname);
+       final_destination = NewStrBufDup(WC->CurRoom.name);
 
        if (havebstr("ok_button")) {
-               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
+               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        serv_puts("FORG");
@@ -2877,8 +3203,8 @@ void do_change_view(int newview) {
 
        serv_printf("VIEW %d", newview);
        serv_getln(buf, sizeof buf);
-       WC->wc_view = newview;
-       smart_goto(WC->wc_roomname);
+       WC->CurRoom.view = newview;
+       smart_goto(WC->CurRoom.name);
 }
 
 
@@ -2925,19 +3251,22 @@ void knrooms(void)
                set_preference("roomlistview", ListView, 1);
        }
        /** Sanitize the input so its safe */
-       if(!get_preference("roomlistview", &ListView) ||
+       if((get_preference("roomlistview", &ListView) != 0)||
           ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
            (strcasecmp(ChrPtr(ListView), "table") != 0))) 
        {
                if (ListView == NULL) {
                        ListView = NewStrBufPlain(HKEY("rooms"));
                        set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
                }
                else {
-                       StrBufPlain(ListView, HKEY("rooms"));
-                       save_preferences();
+                       ListView = NewStrBufPlain(HKEY("rooms"));
+                       set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
                }
        }
+       FreeStrBuf(&ListView);
        url_do_template();
 }
 
@@ -2972,7 +3301,7 @@ void set_room_policy(void) {
 
 void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
 {
-       StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
+       StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
 }
 
 
@@ -2982,15 +3311,27 @@ void _display_private(void) {
 
 void dotgoto(void) {
        if (!havebstr("room")) {
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
                return;
        }
-       if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+       if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
                slrp_highest();
        }
        smart_goto(sbstr("room"));
 }
 
+
+
+void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       if (WCC != NULL)
+               StrBufAppendTemplate(Target, TP, 
+                                    WCC->CurRoom.name, 
+                                    0); 
+}
+
 void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
 {
        wc_printf("<div id=\"banner\">\n");
@@ -3008,138 +3349,99 @@ void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
                StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
 }
 
-
-int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) && 
-               (!IsEmptyStr(WCC->ugname)) && 
-               (strcasecmp(WCC->ugname, ChrPtr(WCC->wc_roomname)) == 0));
+       return (WCC != NULL)? 
+               ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
 }
 
-int ConditionalRoomHas_QR_PERMANENT(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PERMANENT) != 0));
+       return (WCC == NULL)? 0 : 
+               ( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
+                  (WCC->CurRoom.is_inbox) || 
+                  (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
 }
 
-int ConditionalRoomHas_QR_INUSE(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_INUSE) != 0));
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, ChrPtr(WCC->CurRoom.name)) == 0));
 }
 
-int ConditionalRoomHas_QR_PRIVATE(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PRIVATE) != 0));
-}
 
-int ConditionalRoomHas_QR_PASSWORDED(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PASSWORDED) != 0));
-}
+       folder *Folder = (folder *)(TP->Context);
+       long UA_CheckFlag;
+               
+       UA_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (UA_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"UA_*\"- defines or an integer flag 0 is invalid!");
 
-int ConditionalRoomHas_QR_GUESSNAME(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_GUESSNAME) != 0));
+       return ((Folder->RAFlags & UA_CheckFlag) != 0);
 }
 
-int ConditionalRoomHas_QR_DIRECTORY(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_DIRECTORY) != 0));
-}
 
-int ConditionalRoomHas_QR_UPLOAD(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_UPLOAD) != 0));
-}
 
-int ConditionalRoomHas_QR_DOWNLOAD(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalCurrentRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
 {
+       long QR_CheckFlag;
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_DOWNLOAD) != 0));
-}
+       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
 
-int ConditionalRoomHas_QR_VISDIR(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
        return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_VISDIR) != 0));
+               ((WCC->CurRoom.QRFlags & QR_CheckFlag) != 0));
 }
 
-int ConditionalRoomHas_QR_ANONONLY(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_ANONONLY) != 0));
-}
+       long QR_CheckFlag;
+       folder *Folder = (folder *)(TP->Context);
 
-int ConditionalRoomHas_QR_ANONOPT(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_ANONOPT) != 0));
+       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
+       return ((Folder->QRFlags & QR_CheckFlag) != 0);
 }
 
-int ConditionalRoomHas_QR_NETWORK(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_NETWORK) != 0));
-}
 
-int ConditionalRoomHas_QR_PREFONLY(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalCurrentRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
 {
+       long QR2_CheckFlag;
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PREFONLY) != 0));
-}
+       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR2_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
 
-int ConditionalRoomHas_QR_READONLY(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
        return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_READONLY) != 0));
+               ((WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0));
 }
 
-int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_MAILBOX) != 0));
-}
-
-
+       long QR2_CheckFlag;
+       folder *Folder = (folder *)(TP->Context);
 
+       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR2_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
+       return ((Folder->QRFlags2 & QR2_CheckFlag) != 0);
+}
 
 
 int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
@@ -3148,8 +3450,8 @@ int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 
        return ( (WCC!= NULL) && 
                 ((WCC->axlevel >= 6) || 
-                 (WCC->is_room_aide) || 
-                 (WCC->is_mailbox) ));
+                 ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
+                 (WCC->CurRoom.is_inbox) ));
 }
 
 int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
@@ -3157,39 +3459,65 @@ int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
 
        if ((WCC == NULL) ||
-           (TP->Tokens->nParameters < 3) ||
-           (TP->Tokens->Params[2]->Type != TYPE_STR)||
-           (TP->Tokens->Params[2]->len < 7))
-               return 0;
+           (TP->Tokens->nParameters < 3))
+       {
+               return ((WCC->CurRoom.view < VIEW_BBS) || 
+                       (WCC->CurRoom.view > VIEW_MAX));
+       }
 
-       switch(WCC->wc_view) {
-       case VIEW_BBS:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
-       case VIEW_MAILBOX:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
-       case VIEW_ADDRESSBOOK:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
-       case VIEW_TASKS:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
-       case VIEW_NOTES:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
-       case VIEW_WIKI:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
-       case VIEW_JOURNAL:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
-       case VIEW_CALENDAR:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
-       case VIEW_CALBRIEF:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
-       default:
-               return 0;
+       return WCC->CurRoom.view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
+}
+
+
+HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       StrBuf *Line;
+       StrBuf *Token;
+       long State;
+       HashList *Whok = NULL;
+       int Done = 0;
+       int n;
+
+       serv_puts("WHOK");
+       Line = NewStrBuf();
+       Token = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatus(Line, &State) == 1) 
+       {
+               Whok = NewHash(1, Flathash);
+               while(!Done && StrBuf_ServGetln(Line))
+                       if ( (StrLength(Line)==3) && 
+                            !strcmp(ChrPtr(Line), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
+                       
+                               const char *Pos = NULL;
+                               Token = NewStrBufPlain (NULL, StrLength(Line));
+                               StrBufExtract_NextToken(Token, Line, &Pos, '|');
+
+                               Put(Whok, 
+                                   IKEY(n),
+                                   Token, 
+                                   HFreeStrBuf);
+                       }
        }
+       else if (State == 550)
+               StrBufAppendBufPlain(WCC->ImportantMsg,
+                                    _("Higher access is required to access this function."), -1, 0);
+
+
+       return Whok;
 }
 
 void 
 InitModule_ROOMOPS
 (void)
 {
+       initialize_viewdefs();
        RegisterPreference("roomlistview",
                            _("Room list view"),
                            PRF_STRING,
@@ -3198,6 +3526,7 @@ InitModule_ROOMOPS
 
        RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
 
+
        WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
        WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
        WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
@@ -3220,25 +3549,117 @@ InitModule_ROOMOPS
        RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
 
        RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PERMANENT"), 0, ConditionalRoomHas_QR_PERMANENT, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_INUSE"), 0, ConditionalRoomHas_QR_INUSE, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PRIVATE"), 0, ConditionalRoomHas_QR_PRIVATE, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PASSWORDED"), 0, ConditionalRoomHas_QR_PASSWORDED, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_GUESSNAME"), 0, ConditionalRoomHas_QR_GUESSNAME, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DIRECTORY"), 0, ConditionalRoomHas_QR_DIRECTORY, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_UPLOAD"), 0, ConditionalRoomHas_QR_UPLOAD, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DOWNLOAD"), 0, ConditionalRoomHas_QR_DOWNLOAD, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_VISIDIR"), 0, ConditionalRoomHas_QR_VISDIR, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONONLY"), 0, ConditionalRoomHas_QR_ANONONLY, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONOPT"), 0, ConditionalRoomHas_QR_ANONOPT, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_NETWORK"), 0, ConditionalRoomHas_QR_NETWORK, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PREFONLY"), 0, ConditionalRoomHas_QR_PREFONLY, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_READONLY"), 0, ConditionalRoomHas_QR_READONLY, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_MAILBOX"), 0, ConditionalRoomHas_QR_MAILBOX, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:FLAG:QR"), 0, ConditionalCurrentRoomHas_QRFlag, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAG:QR"), 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
+
+       RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalCurrentRoomHas_QRFlag2, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
+       RegisterConditional(HKEY("COND:ROOM:FLAG:UA"), 0, ConditionalRoomHas_UAFlag, CTX_ROOMS);
+
+       RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+       RegisterNamespace("THISROOM:MSGS:NEW", 0, 0, tmplput_CurrentRoom_nNewMessages, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:MSGS:TOTAL", 0, 0, tmplput_CurrentRoom_nTotalMessages, NULL, CTX_NONE);
+
+       RegisterNamespace("THISROOM:FLOOR:NAME", 0, 1, tmplput_CurrentRoomFloorName, NULL, CTX_NONE);
+       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:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
+       RegisterNamespace("THISROOM:VIEW_STRING", 0, 1, tmplput_CurrentRoomViewString, NULL, CTX_NONE);
+       RegisterNamespace("ROOM:VIEW_STRING", 1, 2, tmplput_RoomViewString, NULL, CTX_NONE);
+
+       RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_CurrentRoomInfoText, NULL, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
+       RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_CurrentRoomXNFiles, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:FILES:STR", 0, 1, tmplput_CurrentRoomX_FileString, NULL, CTX_NONE);
+
+       REGISTERTokenParamDefine(QR_PERMANENT);
+       REGISTERTokenParamDefine(QR_INUSE);
+       REGISTERTokenParamDefine(QR_PRIVATE);
+       REGISTERTokenParamDefine(QR_PASSWORDED);
+       REGISTERTokenParamDefine(QR_GUESSNAME);
+       REGISTERTokenParamDefine(QR_DIRECTORY);
+       REGISTERTokenParamDefine(QR_UPLOAD);
+       REGISTERTokenParamDefine(QR_DOWNLOAD);
+       REGISTERTokenParamDefine(QR_VISDIR);
+       REGISTERTokenParamDefine(QR_ANONONLY);
+       REGISTERTokenParamDefine(QR_ANONOPT);
+       REGISTERTokenParamDefine(QR_NETWORK);
+       REGISTERTokenParamDefine(QR_PREFONLY);
+       REGISTERTokenParamDefine(QR_READONLY);
+       REGISTERTokenParamDefine(QR_MAILBOX);
+       REGISTERTokenParamDefine(QR2_SYSTEM);
+       REGISTERTokenParamDefine(QR2_SELFLIST);
+       REGISTERTokenParamDefine(QR2_COLLABDEL);
+       REGISTERTokenParamDefine(QR2_SUBJECTREQ);
+       REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
+       REGISTERTokenParamDefine(QR2_MODERATED);
+
+       REGISTERTokenParamDefine(UA_KNOWN);
+       REGISTERTokenParamDefine(UA_GOTOALLOWED);
+       REGISTERTokenParamDefine(UA_HASNEWMSGS);
+       REGISTERTokenParamDefine(UA_ZAPPED);
+       REGISTERTokenParamDefine(UA_POSTALLOWED);
+       REGISTERTokenParamDefine(UA_ADMINALLOWED);
+       REGISTERTokenParamDefine(UA_DELETEALLOWED);
+       REGISTERTokenParamDefine(UA_ISTRASH);
+
+       REGISTERTokenParamDefine(US_NEEDVALID);
+       REGISTERTokenParamDefine(US_PERM);
+       REGISTERTokenParamDefine(US_LASTOLD);
+       REGISTERTokenParamDefine(US_EXPERT);
+       REGISTERTokenParamDefine(US_UNLISTED);
+       REGISTERTokenParamDefine(US_NOPROMPT);
+       REGISTERTokenParamDefine(US_PROMPTCTL);
+       REGISTERTokenParamDefine(US_DISAPPEAR);
+       REGISTERTokenParamDefine(US_REGIS);
+       REGISTERTokenParamDefine(US_PAGINATOR);
+       REGISTERTokenParamDefine(US_INTERNET);
+       REGISTERTokenParamDefine(US_FLOORS);
+       REGISTERTokenParamDefine(US_COLOR);
+       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);
+
+       /* GNET types: */
+       REGISTERTokenParamDefine(ignet_push_share);
+       { /* these are the parts of an IGNET push config */
+               REGISTERTokenParamDefine(GNET_IGNET_NODE);
+               REGISTERTokenParamDefine(GNET_IGNET_ROOM);
+       }
+       REGISTERTokenParamDefine(listrecp);
+       REGISTERTokenParamDefine(digestrecp);
+       REGISTERTokenParamDefine(pop3client);
+       { /* These are the parts of a pop3 client line... */
+               REGISTERTokenParamDefine(GNET_POP3_HOST);
+               REGISTERTokenParamDefine(GNET_POP3_USER);
+               REGISTERTokenParamDefine(GNET_POP3_DONT_DELETE_REMOTE);
+               REGISTERTokenParamDefine(GNET_POP3_INTERVAL);
+       }
+       REGISTERTokenParamDefine(rssclient);
+       REGISTERTokenParamDefine(participate);
+
+       RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
+       RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
 
        RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
 
+       RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
        RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
        RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
 
@@ -3250,11 +3671,16 @@ void
 SessionDestroyModule_ROOMOPS
 (wcsession *sess)
 {
+       FlushFolder(&sess->CurRoom);
        if (sess->cache_fold != NULL) {
                free(sess->cache_fold);
        }
        
        free_march_list(sess);
        DeleteHash(&sess->Floors);
+       DeleteHash(&sess->Rooms);
+       DeleteHash(&sess->FloorsByName);
 }
+
+
 /*@}*/