ROOMEDIT: add a way to configure aliases
[citadel.git] / webcit / roomops.c
index 982c7139e23a1022738680c8a2e84c6cc3e7f3c5..3dd97ecab4773327348561da6fb9753ab23fb98c 100644 (file)
@@ -1,11 +1,20 @@
 /*
  * Lots of different room-related operations.
+ *
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
-
 ConstStr QRFlagList[] = {
        {HKEY(strof(QR_PERMANENT))},
        {HKEY(strof(QR_INUSE))},
@@ -58,7 +67,7 @@ void _DBG_QR(long QR)
                i = i << 1;
                j++;
        }
-       lprintf(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+       syslog(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
        FreeStrBuf(&QRVec);
 }
 
@@ -81,7 +90,7 @@ void _DBG_QR2(long QR2)
                i = i << 1;
                j++;
        }
-       lprintf(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+       syslog(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
        FreeStrBuf(&QR2Vec);
 }
 
@@ -98,6 +107,11 @@ void _DBG_QR2(long QR2)
 /*******************************************************************************
  ***************************** Goto Commands ***********************************
  ******************************************************************************/
+
+void dotskip(void) {
+       smart_goto(sbstr("room"));
+}
+
 void dotgoto(void) {
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
@@ -166,18 +180,30 @@ long gotoroom(const StrBuf *gname)
        StrBuf *Buf;
        static long ls = (-1L);
        long err = 0;
+       int room_name_supplied = 0;
+       int is_baseroom = 0;
 
        /* store ungoto information */
-       if (StrLength(gname) > 0)
+       if (StrLength(gname) > 0) {
+               room_name_supplied = 1;
+       }
+       if (room_name_supplied) {
                strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+               if (!strcasecmp(ChrPtr(gname), "_BASEROOM_")) {
+                       is_baseroom = 1;
+               }
+       }
        WCC->uglsn = ls;
        Buf = NewStrBuf();
 
        /* move to the new room */
-       if (StrLength(gname) > 0)
+       if (room_name_supplied) {
                serv_printf("GOTO %s", ChrPtr(gname));
-       else /* or just refresh the current state... */
+       }
+       else {
+               /* or just refresh the current state... */
                serv_printf("GOTO 00000000000000000000");
+       }
        StrBuf_ServGetln(Buf);
        if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
@@ -195,11 +221,11 @@ long gotoroom(const StrBuf *gname)
        FlushFolder(&WCC->CurRoom);
        ParseGoto(&WCC->CurRoom, Buf);
 
-       if (StrLength(gname) > 0)
-       {
+       if (room_name_supplied) {
                remove_march(WCC->CurRoom.name);
-               if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
+               if (is_baseroom) {
                        remove_march(gname);
+               }
        }
        FreeStrBuf(&Buf);
 
@@ -240,7 +266,7 @@ void ParseGoto(folder *room, StrBuf *Line)
        memset(room, 0, sizeof(folder));
        room->name = pBuf;
 
-       StrBufExtract_NextToken(room->name, Line, &Pos, '|'); // WC->CurRoom->name
+       StrBufExtract_NextToken(room->name, Line, &Pos, '|');
 
        room->nNewMessages = StrBufExtractNext_long(Line, &Pos, '|'); 
        if (room->nNewMessages > 0)
@@ -250,14 +276,14 @@ void ParseGoto(folder *room, StrBuf *Line)
 
        room->ShowInfo =  StrBufExtractNext_long(Line, &Pos, '|');
        
-       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
+       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|');
 
        DBG_QR(room->QRFlags);
 
        room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
        room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
+       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|');
 
        flag = StrBufExtractNext_long(Line, &Pos, '|');
        if (WCC->is_aide || flag) {
@@ -266,17 +292,17 @@ void ParseGoto(folder *room, StrBuf *Line)
 
        room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->floorid = StrBufExtractNext_int(Line, &Pos, '|'); // wc_floor
+       room->floorid = StrBufExtractNext_int(Line, &Pos, '|');
 
-       room->view = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->view
+       room->view = StrBufExtractNext_long(Line, &Pos, '|');
 
-       room->defview = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->defview
+       room->defview = StrBufExtractNext_long(Line, &Pos, '|');
 
        flag = StrBufExtractNext_long(Line, &Pos, '|');
        if (flag)
-               room->RAFlags |= UA_ISTRASH; // wc_is_trash
+               room->RAFlags |= UA_ISTRASH;
 
-       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|');
        DBG_QR2(room->QRFlags2);
 
        /* find out, whether we are in a sub-room */
@@ -317,33 +343,40 @@ void ParseGoto(folder *room, StrBuf *Line)
        room->Floor = (const Floor*) vFloor;
 }
 
-/**
- * \brief Delete the current room
+/*
+ * Delete the current room
  */
 void delete_room(void)
 {
-       char buf[SIZ];
-
+       StrBuf *Line = NewStrBuf();
+       const StrBuf *GoBstr;
        
-       serv_puts("KILL 1");
-       serv_getln(buf, sizeof buf);
+       GoBstr = sbstr("go");
 
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
-               return;
-       } else {
-               StrBuf *Buf;
-               
-               FlushRoomlist ();
-               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
-               smart_goto(Buf);
-               FreeStrBuf(&Buf);
+       if (GoBstr != NULL)
+       {
+               if (gotoroom(GoBstr) == 200)
+               {
+                       serv_puts("KILL 1");
+                       StrBuf_ServGetln(Line);
+                       if (GetServerStatusMsg(Line, NULL, 1, 2) == 2) {
+                               StrBuf *Buf;
+                               
+                               FlushRoomlist ();
+                               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+                               smart_goto(Buf);
+                               FreeStrBuf(&Buf);
+                               FreeStrBuf(&Line);
+                               return;
+                       }
+               }
        }
+       display_main_menu();
+       FreeStrBuf(&Line);
 }
 
-/**
- * \brief zap a room
+/*
+ * zap a room
  */
 void zap(void)
 {
@@ -452,7 +485,7 @@ int SaveRoomAide(folder *Room)
 }
 
 
-int GetCurrentRoomFlags(folder *Room)
+int GetCurrentRoomFlags(folder *Room, int CareForStatusMessage)
 {
        StrBuf *Buf;
 
@@ -463,8 +496,10 @@ int GetCurrentRoomFlags(folder *Room)
                FlushStrBuf(Room->XAPass);
                FlushStrBuf(Room->Directory);
                StrBufCutLeft(Buf, 4);
-               AppendImportantMessage (SKEY(Buf));
+               if (CareForStatusMessage)
+                       AppendImportantMessage (SKEY(Buf));
                FreeStrBuf(&Buf);
+               Room->XALoaded = 2;
                return 0;
        } else {
                const char *Pos;
@@ -531,10 +566,10 @@ void LoadRoomXA (void)
 {
        wcsession *WCC = WC;
                
-       if (WCC->CurRoom.XALoaded)
+       if (WCC->CurRoom.XALoaded > 0)
                return;
 
-       GetCurrentRoomFlags(&WCC->CurRoom);
+       GetCurrentRoomFlags(&WCC->CurRoom, 0);
 }
 
 
@@ -629,7 +664,7 @@ void LoadXRoomXCountFiles(void)
 void toggle_self_service(void) {
        wcsession *WCC = WC;
 
-       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+       if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0)
                return;
 
        if (yesbstr("QR2_SelfList")) 
@@ -652,8 +687,10 @@ void toggle_self_service(void) {
                WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
 
        SetCurrentRoomFlags (&WCC->CurRoom);
-       
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+
+       output_headers(1, 1, 1, 0, 0, 0);       
+       do_template("room_edit");
+       wDumpContent(1);
 }
 
 
@@ -669,113 +706,109 @@ void editroom(void)
        const StrBuf *er_password;
        const StrBuf *er_dirname;
        const StrBuf *er_roomaide;
-       unsigned er_flags;
-       unsigned er_flags2;
        int succ1, succ2;
 
        if (!havebstr("ok_button")) {
-               strcpy(WC->ImportantMessage,
-                      _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                return;
        }
-       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+
+       if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                return;
+       }
 
        LoadRoomAide();
-
-       er_flags = WCC->CurRoom.QRFlags;
-       er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
-       er_flags2 = WCC->CurRoom.QRFlags2;
+       WCC->CurRoom.QRFlags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
 
        Ptr = sbstr("type");
        if (!strcmp(ChrPtr(Ptr), "invonly")) {
-               er_flags |= (QR_PRIVATE);
+               WCC->CurRoom.QRFlags |= (QR_PRIVATE);
        }
        if (!strcmp(ChrPtr(Ptr), "hidden")) {
-               er_flags |= (QR_PRIVATE | QR_GUESSNAME);
+               WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_GUESSNAME);
        }
        if (!strcmp(ChrPtr(Ptr), "passworded")) {
-               er_flags |= (QR_PRIVATE | QR_PASSWORDED);
+               WCC->CurRoom.QRFlags |= (QR_PRIVATE | QR_PASSWORDED);
        }
        if (!strcmp(ChrPtr(Ptr), "personal")) {
-               er_flags |= QR_MAILBOX;
+               WCC->CurRoom.QRFlags |= QR_MAILBOX;
        } else {
-               er_flags &= ~QR_MAILBOX;
+               WCC->CurRoom.QRFlags &= ~QR_MAILBOX;
        }
 
-
-       
        if (yesbstr("prefonly")) {
-               er_flags |= QR_PREFONLY;
+               WCC->CurRoom.QRFlags |= QR_PREFONLY;
        } else {
-               er_flags &= ~QR_PREFONLY;
+               WCC->CurRoom.QRFlags &= ~QR_PREFONLY;
        }
 
        if (yesbstr("readonly")) {
-               er_flags |= QR_READONLY;
+               WCC->CurRoom.QRFlags |= QR_READONLY;
        } else {
-               er_flags &= ~QR_READONLY;
+               WCC->CurRoom.QRFlags &= ~QR_READONLY;
        }
 
-       
        if (yesbstr("collabdel")) {
-               er_flags2 |= QR2_COLLABDEL;
+               WCC->CurRoom.QRFlags2 |= QR2_COLLABDEL;
        } else {
-               er_flags2 &= ~QR2_COLLABDEL;
+               WCC->CurRoom.QRFlags2 &= ~QR2_COLLABDEL;
        }
 
        if (yesbstr("permanent")) {
-               er_flags |= QR_PERMANENT;
+               WCC->CurRoom.QRFlags |= QR_PERMANENT;
        } else {
-               er_flags &= ~QR_PERMANENT;
+               WCC->CurRoom.QRFlags &= ~QR_PERMANENT;
        }
 
        if (yesbstr("subjectreq")) {
-               er_flags2 |= QR2_SUBJECTREQ;
+               WCC->CurRoom.QRFlags2 |= QR2_SUBJECTREQ;
        } else {
-               er_flags2 &= ~QR2_SUBJECTREQ;
+               WCC->CurRoom.QRFlags2 &= ~QR2_SUBJECTREQ;
        }
 
        if (yesbstr("network")) {
-               er_flags |= QR_NETWORK;
+               WCC->CurRoom.QRFlags |= QR_NETWORK;
        } else {
-               er_flags &= ~QR_NETWORK;
+               WCC->CurRoom.QRFlags &= ~QR_NETWORK;
        }
 
        if (yesbstr("directory")) {
-               er_flags |= QR_DIRECTORY;
+               WCC->CurRoom.QRFlags |= QR_DIRECTORY;
        } else {
-               er_flags &= ~QR_DIRECTORY;
+               WCC->CurRoom.QRFlags &= ~QR_DIRECTORY;
        }
 
        if (yesbstr("ulallowed")) {
-               er_flags |= QR_UPLOAD;
+               WCC->CurRoom.QRFlags |= QR_UPLOAD;
        } else {
-               er_flags &= ~QR_UPLOAD;
+               WCC->CurRoom.QRFlags &= ~QR_UPLOAD;
        }
 
        if (yesbstr("dlallowed")) {
-               er_flags |= QR_DOWNLOAD;
+               WCC->CurRoom.QRFlags |= QR_DOWNLOAD;
        } else {
-               er_flags &= ~QR_DOWNLOAD;
+               WCC->CurRoom.QRFlags &= ~QR_DOWNLOAD;
        }
 
        if (yesbstr("visdir")) {
-               er_flags |= QR_VISDIR;
+               WCC->CurRoom.QRFlags |= QR_VISDIR;
        } else {
-               er_flags &= ~QR_VISDIR;
+               WCC->CurRoom.QRFlags &= ~QR_VISDIR;
        }
 
-
        Ptr = sbstr("anon");
 
-       er_flags &= ~(QR_ANONONLY | QR_ANONOPT);
+       WCC->CurRoom.QRFlags &= ~(QR_ANONONLY | QR_ANONOPT);
        if (!strcmp(ChrPtr(Ptr), "anononly"))
-               er_flags |= QR_ANONONLY;
+               WCC->CurRoom.QRFlags |= QR_ANONONLY;
        if (!strcmp(ChrPtr(Ptr), "anon2"))
-               er_flags |= QR_ANONOPT;
+               WCC->CurRoom.QRFlags |= QR_ANONOPT;
 
        er_name     = sbstr("er_name");
        er_dirname  = sbstr("er_dirname");
@@ -802,9 +835,12 @@ void editroom(void)
 
        succ2 = SaveRoomAide (&WCC->CurRoom);
        
-       if (succ1 + succ2 == 0)
+       if (succ1 + succ2 == 0) {
                AppendImportantMessage (_("Your changes have been saved."), -1);
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       }
+       output_headers(1, 1, 1, 0, 0, 0);       
+       do_template("room_edit");
+       wDumpContent(1);
        return;
 }
 
@@ -821,7 +857,7 @@ void do_invt_kick(void)
        wcsession *WCC = WC;
 
 
-       if (GetCurrentRoomFlags(&WCC->CurRoom) == 1)
+       if (GetCurrentRoomFlags(&WCC->CurRoom, 1) == 1)
        {
                const char *Pos;
                UserNames = sbstr("username");
@@ -839,7 +875,8 @@ void do_invt_kick(void)
                        if ((StrLength(User) > 0) && (Kick))
                        {
                                serv_printf("KICK %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -855,7 +892,8 @@ void do_invt_kick(void)
                        else if ((StrLength(User) > 0) && (Invite))
                        {
                                serv_printf("INVT %s", ChrPtr(User));
-                               StrBuf_ServGetln(Buf);
+                               if (StrBuf_ServGetln(Buf) < 0)
+                                       break;
                                if (GetServerStatus(Buf, NULL) != 2) {
                                        StrBufCutLeft(Buf, 4);
                                        AppendImportantMessage(SKEY(Buf));
@@ -871,7 +909,9 @@ void do_invt_kick(void)
                 }
         }
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       output_headers(1, 1, 1, 0, 0, 0);       
+       do_template("room_edit");
+       wDumpContent(1);
 }
 
 
@@ -880,7 +920,7 @@ void do_invt_kick(void)
  */
 void entroom(void)
 {
-       char buf[SIZ];
+       StrBuf *Line;
        const StrBuf *er_name;
        const StrBuf *er_type;
        const StrBuf *er_password;
@@ -890,8 +930,7 @@ void entroom(void)
        wcsession *WCC = WC;
 
        if (!havebstr("ok_button")) {
-               strcpy(WC->ImportantMessage,
-                      _("Cancelled.  No new room was created."));
+               AppendImportantMessage(_("Cancelled.  No new room was created."), -1);
                display_main_menu();
                return;
        }
@@ -919,9 +958,10 @@ void entroom(void)
                    0, 
                    er_view);
 
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               strcpy(WCC->ImportantMessage, &buf[4]);
+       Line = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+               FreeStrBuf(&Line);
                display_main_menu();
                return;
        }
@@ -929,15 +969,18 @@ void entroom(void)
        gotoroom(er_name);
 
        serv_printf("VIEW %d", er_view);
-       serv_getln(buf, sizeof buf);
+       StrBuf_ServGetln(Line);
+       FreeStrBuf(&Line); /* TODO: should we care about errors? */
        WCC->CurRoom.view = er_view;
 
        if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
        } else {
                smart_goto(WCC->CurRoom.name);
        }
-
+       FreeStrBuf(&Line);
 }
 
 
@@ -960,40 +1003,44 @@ void change_view(void) {
 
 
 
-/**
- * \brief Set the message expire policy for this room and/or floor
+/*
+ * Set the message expire policy for this room and/or floor
  */
 void set_room_policy(void) {
-       char buf[SIZ];
+       StrBuf *Line;
 
        if (!havebstr("ok_button")) {
-               strcpy(WC->ImportantMessage,
-                      _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                return;
        }
 
-       serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
-       serv_getln(buf, sizeof buf);
-       strcpy(WC->ImportantMessage, &buf[4]);
+       Line = NewStrBuf();
 
+       serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+       StrBuf_ServGetln(Line);
+       GetServerStatusMsg(Line, NULL, 1, 0);
        if (WC->axlevel >= 6) {
-               strcat(WC->ImportantMessage, "<br>\n");
-               serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
-               serv_getln(buf, sizeof buf);
-               strcat(WC->ImportantMessage, &buf[4]);
+               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+               StrBuf_ServGetln(Line);
+               GetServerStatusMsg(Line, NULL, 1, 0);
        }
+       FreeStrBuf(&Line);
        ReloadCurrentRoom();
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+
+       output_headers(1, 1, 1, 0, 0, 0);       
+       do_template("room_edit");
+       wDumpContent(1);
 }
 
 
 
-/**
- * \brief Perform changes to a room's network configuration
+/*
+ * Perform changes to a room's network configuration
  */
 void netedit(void) {
-       FILE *fp;
        char buf[SIZ];
        char line[SIZ];
        char cmpa0[SIZ];
@@ -1002,8 +1049,15 @@ void netedit(void) {
        char cmpb1[SIZ];
        int i, num_addrs;
        StrBuf *Line;
+       StrBuf *TmpBuf;
+       int malias = 0;
+       char sepchar = '|';
        int Done;
 
+       line[0] = '\0';
+        if (havebstr("force_room")) {
+                gotoroom(sbstr("force_room"));
+       }
        /*/ TODO: do line dynamic! */
        if (havebstr("line_pop3host")) {
                strcpy(line, bstr("prefix"));
@@ -1023,33 +1077,41 @@ void netedit(void) {
                strcat(line, bstr("line"));
                strcat(line, bstr("suffix"));
        }
-       else {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
-               return;
+       else if (havebstr("alias")) {
+               malias = 1;
+               sepchar = ',';
+               strcat(line, bstr("prefix"));
+               strcat(line, ",");
+               strcat(line, "room_");
+               strcat(line, ChrPtr(WC->CurRoom.name));
        }
-
-
-       fp = tmpfile();
-       if (fp == NULL) {
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       else {
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                return;
        }
 
        Line = NewStrBuf();
-       serv_puts("GNET");
+       TmpBuf = NewStrBuf();
+       if (malias)
+               serv_puts("GNET "FILE_MAILALIAS);
+       else
+               serv_puts("GNET");
        StrBuf_ServGetln(Line);
        if  (GetServerStatus(Line, NULL) != 1) {
-               fclose(fp);
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
                FreeStrBuf(&Line);
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                return;
        }
 
        /** This loop works for add *or* remove.  Spiffy, eh? */
        Done = 0;
-       extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
-       extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
+       extract_token(cmpb0, line, 0, sepchar, sizeof cmpb0);
+       extract_token(cmpb1, line, 1, sepchar, sizeof cmpb1);
        while (!Done && StrBuf_ServGetln(Line)>=0) {
                if ( (StrLength(Line)==3) && 
                     !strcmp(ChrPtr(Line), "000")) 
@@ -1058,31 +1120,37 @@ void netedit(void) {
                }
                else
                {
-                       extract_token(cmpa0, ChrPtr(Line), 0, '|', sizeof cmpa0);
-                       extract_token(cmpa1, ChrPtr(Line), 1, '|', sizeof cmpa1);
-                       if ( (strcasecmp(cmpa0, cmpb0)) 
-                            || (strcasecmp(cmpa1, cmpb1)) ) {
+                       if (StrLength(Line) == 0)
+                               continue;
+
+                       extract_token(cmpa0, ChrPtr(Line), 0, sepchar, sizeof cmpa0);
+                       extract_token(cmpa1, ChrPtr(Line), 1, sepchar, sizeof cmpa1);
+                       if ( (strcasecmp(cmpa0, cmpb0)) || (strcasecmp(cmpa1, cmpb1)) )
+                       {
                                StrBufAppendBufPlain(Line, HKEY("\n"), 0);
-                               fwrite(SKEY(Line), 1, fp);
+                               StrBufAppendBuf(TmpBuf, Line, 0);
                        }
                }
        }
 
-       rewind(fp);
-       serv_puts("SNET");
+       if (malias)
+               serv_puts("SNET "FILE_MAILALIAS);
+       else
+               serv_puts("SNET");
        StrBuf_ServGetln(Line);
        if  (GetServerStatus(Line, NULL) != 4) {
-               fclose(fp);
+
                AppendImportantMessage(SRV_STATUS_MSG(Line));   
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               output_headers(1, 1, 1, 0, 0, 0);       
+               do_template("room_edit");
+               wDumpContent(1);
                FreeStrBuf(&Line);
+               FreeStrBuf(&TmpBuf);
                return;
        }
 
-       while (fgets(buf, sizeof buf, fp) != NULL) {
-               buf[strlen(buf)-1] = 0;
-               serv_puts(buf);
-       }
+       serv_putbuf(TmpBuf);
+       FreeStrBuf(&TmpBuf);
 
        if (havebstr("add_button")) {
                num_addrs = num_tokens(bstr("line"), ',');
@@ -1104,38 +1172,23 @@ void netedit(void) {
        }
 
        serv_puts("000");
-       fclose(fp);
        FlushIgnetCfgs(&WC->CurRoom);
        FreeStrBuf(&Line);
 
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+       output_headers(1, 1, 1, 0, 0, 0);       
+       do_template("room_edit");
+       wDumpContent(1);
 }
 
-/**
- * \brief Do either a known rooms list or a folders list, depending on the
- * user's preference
+/*
+ * Known rooms list (box style)
  */
 void knrooms(void)
 {
-       StrBuf *ListView = NULL;
-
-       /** Determine whether the user is trying to change views */
-       if (havebstr("view")) {
-               ListView = NewStrBufDup(SBSTR("view"));
-               set_preference("roomlistview", ListView, 1);
-       }
-       /** Sanitize the input so its safe */
-       if ((get_preference("roomlistview", &ListView) == 0)||
-           (
-                   (strcasecmp(ChrPtr(ListView), "folders") != 0) &&
-                   (strcasecmp(ChrPtr(ListView), "rooms") != 0)
-                   )
-               )
-       {
-               ListView = NewStrBufPlain(HKEY("rooms"));
-               set_preference("roomlistview", ListView, 0);
-       }
-       url_do_template();
+       DeleteHash(&WC->Rooms);
+       output_headers(1, 1, 1, 0, 0, 0); 
+       do_template("knrooms");
+       wDumpContent(1);
 }
 
 
@@ -1184,7 +1237,7 @@ void delete_floor(void) {
        AppendImportantMessage (SKEY(Buf));
 
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1207,7 +1260,7 @@ void create_floor(void) {
        }
        AppendImportantMessage (SKEY(Buf));
        FlushRoomlist();
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1227,7 +1280,7 @@ void rename_floor(void) {
        StrBufCutLeft(Buf, 4);
        AppendImportantMessage (SKEY(Buf));
 
-       http_transmit_thing(ChrPtr(do_template("floors", NULL)), 0);
+       http_transmit_thing(ChrPtr(do_template("floors")), 0);
        FreeStrBuf(&Buf);
 }
 
@@ -1284,14 +1337,13 @@ InitModule_ROOMOPS
                            NULL);
         RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
 
-       
        WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
 
        WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
        WebcitAddUrlHandler(HKEY("rename_floor"), "", 0, rename_floor, 0);
        WebcitAddUrlHandler(HKEY("create_floor"), "", 0, create_floor, 0);
 
-       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
        WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
 
@@ -1337,6 +1389,7 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(UA_POSTALLOWED);
        REGISTERTokenParamDefine(UA_ADMINALLOWED);
        REGISTERTokenParamDefine(UA_DELETEALLOWED);
+       REGISTERTokenParamDefine(UA_REPLYALLOWED);
        REGISTERTokenParamDefine(UA_ISTRASH);
 
        REGISTERTokenParamDefine(US_NEEDVALID);
@@ -1364,6 +1417,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. */
@@ -1400,5 +1454,3 @@ SessionDestroyModule_ROOMOPS
        _FlushRoomList (sess);
 }
 
-
-/*@}*/