]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
Nearly all <FORM> blocks now contain a hidden input
[citadel.git] / webcit / roomops.c
index d134121ed717311a40f15ea3924432f4895be716..832b622d1e4ae39d8e6d6bbeac4d792329c46e99 100644 (file)
@@ -197,7 +197,6 @@ void listrms(char *variety)
        struct roomlisting *rp;
        struct roomlisting *rs;
 
-
        /** Ask the server for a room list */
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
@@ -205,6 +204,7 @@ void listrms(char *variety)
                wprintf("&nbsp;");
                return;
        }
+
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ++num_rooms;
                rp = malloc(sizeof(struct roomlisting));
@@ -272,12 +272,37 @@ void zapped_list(void)
  */
 void readinfo(void)
 {
-       char buf[SIZ];
+       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') {
-               fmout("CENTER");
+
+               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], "...");
+
+                wprintf("<div class=\"infos\" "
+                "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
+                ">");
+               escputs(briefinfo);
+                wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
+               wprintf("<img class=\"close_infos\" "
+                       "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
+                       "src=\"static/closewindow.gif\" alt=\"%s\">",
+                       _("Close window")
+               );
+               escputs(fullinfo);
+                wprintf("</div>");
        }
        else {
                wprintf("&nbsp;");
@@ -409,6 +434,7 @@ void embed_search_o_matic(void) {
  * \param navbar_style         Determines which navigation buttons to display
  *
  */
+
 void embed_room_banner(char *got, int navbar_style) {
        char buf[256];
 
@@ -441,7 +467,8 @@ void embed_room_banner(char *got, int navbar_style) {
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
+       stresc(buf, WC->wc_roomname, 1, 1);
+       svprintf("ROOMNAME", WCS_STRING, "%s", buf);
        svprintf("NUMMSGS", WCS_STRING,
                _("%d new of %d messages"),
                extract_int(&got[4], 1),
@@ -456,25 +483,23 @@ void embed_room_banner(char *got, int navbar_style) {
        do_template("roombanner");
        if (navbar_style != navbar_none) {
 
-               wprintf("<div id=\"navbar\">\n"
-                       "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>\n");
-
+               wprintf("<div id=\"navbar\"><ul>");
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"ungoto\">"
                        "<a href=\"ungoto\">"
                        "<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></A>"
-                       "</td>\n", _("Ungoto")
+                       "</li>\n", _("Ungoto")
                );
 
                if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
                        wprintf(
-                               "<td>"
+                               "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
                                "<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
                                "<span class=\"navbar_link\">%s</span></A>"
-                               "</td>\n", _("Read new messages")
+                               "</li>\n", _("Read new messages")
                        );
                }
 
@@ -482,99 +507,99 @@ void embed_room_banner(char *got, int navbar_style) {
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"viewcontacts\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View contacts")
+                                               "</span></a></li>\n", _("View contacts")
                                        );
                                        break;
                                case VIEW_CALENDAR:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"staskday\">"
                                                "<a href=\"readfwd?calview=day\">"
                                                "<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Day view")
+                                               "</span></a></li>\n", _("Day view")
                                        );
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"monthview\">"
                                                "<a href=\"readfwd?calview=month\">"
                                                "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Month view")
+                                               "</span></a></li>\n", _("Month view")
                                        );
                                        break;
                                case VIEW_CALBRIEF:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"monthview\">"
                                                "<a href=\"readfwd?calview=month\">"
                                                "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Calendar list")
+                                               "</span></a></li>\n", _("Calendar list")
                                        );
                                        break;
                                case VIEW_TASKS:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"taskmanag\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View tasks")
+                                               "</span></a></li>\n", _("View tasks")
                                        );
                                        break;
                                case VIEW_NOTES:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"viewnotes\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View notes")
+                                               "</span></a></li>\n", _("View notes")
                                        );
                                        break;
                                case VIEW_MAILBOX:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View message list")
+                                               "</span></a></li>\n", _("View message list")
                                        );
                                        break;
                                case VIEW_WIKI:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Wiki home")
+                                               "</span></a></li>\n", _("Wiki home")
                                        );
                                        break;
                                default:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Read all messages")
+                                               "</span></a></li>\n", _("Read all messages")
                                        );
                                        break;
                        }
@@ -584,16 +609,17 @@ void embed_room_banner(char *got, int navbar_style) {
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"addnewcontact\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new contact")
+                                               "</span></a></li>\n", _("Add new contact")
                                        );
                                        break;
                                case VIEW_CALENDAR:
                                case VIEW_CALBRIEF:
-                                       wprintf("<td><a href=\"display_enter");
+                                       wprintf("<li class=\"addevent\"><a href=\"display_enter");
                                        if (strlen(bstr("year")) > 0) wprintf("?year=%s", bstr("year"));
                                        if (strlen(bstr("month")) > 0) wprintf("?month=%s", bstr("month"));
                                        if (strlen(bstr("day")) > 0) wprintf("?day=%s", bstr("day"));
@@ -601,81 +627,92 @@ void embed_room_banner(char *got, int navbar_style) {
                                                "<img align=\"middle\" src=\"static/addevent_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new event")
+                                               "</span></a></li>\n", _("Add new event")
                                        );
                                        break;
                                case VIEW_TASKS:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new task")
+                                               "</span></a></li>\n", _("Add new task")
                                        );
                                        break;
                                case VIEW_NOTES:
                                        wprintf(
-                                               "<td><a href=\"javascript:add_new_note();\">"
+                                               "<li class=\"enternewnote\">"
+                                               "<a href=\"javascript:add_new_note();\">"
                                                "<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new note")
+                                               "</span></a></li>\n", _("Add new note")
                                        );
                                        break;
                                case VIEW_WIKI:
                                        safestrncpy(buf, bstr("page"), sizeof buf);
                                        str_wiki_index(buf);
                                        wprintf(
-                                               "<td><a href=\"display_enter?wikipage=%s\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter?wikipage=%s\">"
+                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", buf, _("Edit this page")
+                                       );
+                                       break;
+                               case VIEW_MAILBOX:
+                                       wprintf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", buf, _("Edit this page")
+                                               "</span></a></li>\n", _("Write mail")
                                        );
                                        break;
                                default:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Enter a message")
+                                               "</span></a></li>\n", _("Enter a message")
                                        );
                                        break;
                        }
                }
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
                        _("Skip this room")
                );
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
                        _("Goto next room")
                );
 
-               wprintf("</tr></table></div>\n");
+               wprintf("</ul></div>\n");
        }
 
 }
 
 
-
-
-
 /**
  * \brief back end routine to take the session to a new room
  * \param gname room to go to
@@ -716,6 +753,7 @@ int gotoroom(char *gname)
        WC->wc_view = extract_int(&buf[4], 11);
        WC->wc_default_view = extract_int(&buf[4], 12);
        WC->wc_is_trash = extract_int(&buf[4], 13);
+       WC->room_flags2 = extract_int(&buf[4], 14);
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
@@ -967,15 +1005,16 @@ int self_service(int newval) {
 void display_editroom(void)
 {
        char buf[SIZ];
-       char cmd[SIZ];
-       char node[SIZ];
-       char remote_room[SIZ];
-       char recp[SIZ];
+       char cmd[1024];
+       char node[256];
+       char remote_room[128];
+       char recp[1024];
        char er_name[128];
        char er_password[10];
        char er_dirname[15];
        char er_roomaide[26];
        unsigned er_flags;
+       unsigned er_flags2;
        int er_floor;
        int i, j;
        char *tab;
@@ -1003,6 +1042,7 @@ void display_editroom(void)
        extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
        er_flags = extract_int(&buf[4], 3);
        er_floor = extract_int(&buf[4], 4);
+       er_flags2 = extract_int(&buf[4], 7);
 
        output_headers(1, 1, 1, 0, 0, 0);
 
@@ -1136,6 +1176,7 @@ void display_editroom(void)
 
        if (!strcmp(tab, "config")) {
                wprintf("<FORM METHOD=\"POST\" action=\"editroom\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        
                wprintf("<UL><LI>");
                wprintf(_("Name of room: "));
@@ -1166,7 +1207,7 @@ void display_editroom(void)
                if ((er_flags & QR_PRIVATE) == 0)
                wprintf("CHECKED ");
                wprintf("> ");
-               wprintf(_("Public room"));
+               wprintf(_("Public (automatically appears to everyone)"));
                wprintf("\n");
 
                wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
@@ -1174,14 +1215,14 @@ void display_editroom(void)
                    (er_flags & QR_GUESSNAME))
                        wprintf("CHECKED ");
                wprintf("> ");
-               wprintf(_("Private - guess name"));
+               wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
        
                wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
                if ((er_flags & QR_PRIVATE) &&
                    (er_flags & QR_PASSWORDED))
                        wprintf("CHECKED ");
                wprintf("> ");
-               wprintf(_("Private - require password:"));
+               wprintf(_("Private - require password: "));
                wprintf("\n<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
                        er_password);
        
@@ -1211,6 +1252,12 @@ void display_editroom(void)
                wprintf("> ");
                wprintf(_("Read-only room"));
        
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+               if (er_flags2 & QR2_COLLABDEL)
+                       wprintf("CHECKED ");
+               wprintf("> ");
+               wprintf(_("All users allowed to post may also delete messages"));
+       
                /** directory stuff */
                wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
                if (er_flags & QR_DIRECTORY)
@@ -1256,6 +1303,12 @@ void display_editroom(void)
                wprintf("> ");
                wprintf(_("Permanent (does not auto-purge)"));
 
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+               if (er_flags2 & QR2_SUBJECTREQ)
+                       wprintf("CHECKED ");
+               wprintf("> ");
+               wprintf(_("Subject Required (Force users to specify a message subject)"));
+
                /** start of anon options */
        
                wprintf("\n<LI>");
@@ -1377,9 +1430,9 @@ void display_editroom(void)
                        extract_token(node, buf, 0, '|', sizeof node);
                        extract_token(remote_room, buf, 1, '|', sizeof remote_room);
                        if (strlen(node) > 0) {
-                               wprintf("<FORM METHOD=\"POST\" "
-                                       "action=\"netedit\">"
-                                       "<TR><TD>%s</TD>\n", node);
+                               wprintf("<FORM METHOD=\"POST\" action=\"netedit\">");
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<TR><TD>%s</TD>\n", node);
 
                                wprintf("<TD>");
                                if (strlen(remote_room) > 0) {
@@ -1420,9 +1473,9 @@ void display_editroom(void)
                for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
                        extract_token(node, not_shared_with, i, '\n', sizeof node);
                        if (strlen(node) > 0) {
-                               wprintf("<FORM METHOD=\"POST\" "
-                                       "action=\"netedit\">"
-                                       "<TR><TD>");
+                               wprintf("<FORM METHOD=\"POST\" action=\"netedit\">");
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<TR><TD>");
                                escputs(node);
                                wprintf("</TD><TD>"
                                        "<INPUT TYPE=\"INPUT\" "
@@ -1482,10 +1535,9 @@ void display_editroom(void)
                                extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&line="
-                                       "listrecp|");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">");
+                               wprintf("\">");
                                wprintf(_("(remove)"));
                                wprintf("</A><br />");
                        }
@@ -1493,7 +1545,8 @@ void display_editroom(void)
                wprintf("<br /><FORM METHOD=\"POST\" action=\"netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<INPUT TYPE=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
                wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</FORM>\n");
 
@@ -1512,10 +1565,10 @@ void display_editroom(void)
                                extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&line="
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
                                        "digestrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">");
+                               wprintf("\">");
                                wprintf(_("(remove)"));
                                wprintf("</A><br />");
                        }
@@ -1523,12 +1576,28 @@ void display_editroom(void)
                wprintf("<br /><FORM METHOD=\"POST\" action=\"netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<INPUT TYPE=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
                wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</FORM>\n");
                
-               wprintf("</TD></TR></TABLE><hr />\n");
+               wprintf("</TD></TR></TABLE>\n");
+
+               /** Pop open an address book -- begin **/
+               wprintf("<div align=right>"
+                       "<a href=\"javascript:PopOpenAddressBook('add_as_listrecp|%s|add_as_digestrecp|%s');\" "
+                       "title=\"%s\">"
+                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+                       "&nbsp;%s</a>"
+                       "</div>",
+                       _("List"),
+                       _("Digest"),
+                       _("Add recipients from Contacts or other address books"),
+                       _("Add recipients from Contacts or other address books")
+               );
+               /** Pop open an address book -- end **/
 
+               wprintf("<hr />");
                if (self_service(999) == 1) {
                        wprintf(_("This room is configured to allow "
                                "self-service subscribe/unsubscribe requests."));
@@ -1572,6 +1641,7 @@ void display_editroom(void)
                }
                
                wprintf("<br /><FORM METHOD=\"POST\" action=\"set_room_policy\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
                wprintf("<TABLE border=0 cellspacing=5>\n");
                wprintf("<TR><TD>");
                wprintf(_("Message expire policy for this room"));
@@ -1648,6 +1718,7 @@ void display_editroom(void)
        /** end content of whatever tab is open now */
        wprintf("</TD></TR></TABLE></div>\n");
 
+       address_book_popup();
        wDumpContent(1);
 }
 
@@ -1677,6 +1748,9 @@ void editroom(void)
        char er_roomaide[26];
        int er_floor;
        unsigned er_flags;
+       int er_listingorder;
+       int er_defaultview;
+       unsigned er_flags2;
        int bump;
 
 
@@ -1698,6 +1772,9 @@ void editroom(void)
        extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
        extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
        er_flags = extract_int(&buf[4], 3);
+       er_listingorder = extract_int(&buf[4], 5);
+       er_defaultview = extract_int(&buf[4], 6);
+       er_flags2 = extract_int(&buf[4], 7);
 
        strcpy(er_roomaide, bstr("er_roomaide"));
        if (strlen(er_roomaide) == 0) {
@@ -1749,12 +1826,24 @@ void editroom(void)
                er_flags &= ~QR_READONLY;
        }
 
+       if (!strcmp(bstr("collabdel"), "yes")) {
+               er_flags2 |= QR2_COLLABDEL;
+       } else {
+               er_flags2 &= ~QR2_COLLABDEL;
+       }
+
        if (!strcmp(bstr("permanent"), "yes")) {
                er_flags |= QR_PERMANENT;
        } else {
                er_flags &= ~QR_PERMANENT;
        }
 
+       if (!strcmp(bstr("subjectreq"), "yes")) {
+               er_flags2 |= QR2_SUBJECTREQ;
+       } else {
+               er_flags2 &= ~QR2_SUBJECTREQ;
+       }
+
        if (!strcmp(bstr("network"), "yes")) {
                er_flags |= QR_NETWORK;
        } else {
@@ -1799,8 +1888,9 @@ void editroom(void)
 
        er_floor = atoi(bstr("er_floor"));
 
-       sprintf(buf, "SETR %s|%s|%s|%u|%d|%d",
-            er_name, er_password, er_dirname, er_flags, bump, er_floor);
+       sprintf(buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
+               er_name, er_password, er_dirname, er_flags, bump, er_floor,
+               er_listingorder, er_defaultview, er_flags2);
        serv_puts(buf);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
@@ -1901,6 +1991,7 @@ void display_whok(void)
        wprintf("<br /><br />");
        
         wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
         wprintf("<SELECT NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
@@ -1925,6 +2016,7 @@ void display_whok(void)
 
         wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
         wprintf(_("Invite:"));
        wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
@@ -1969,6 +2061,7 @@ void display_entroom(void)
                "<table class=\"roomops_background\"><tr><td>\n");
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
        wprintf("<UL><LI>");
        wprintf(_("Name of room: "));
@@ -2191,6 +2284,7 @@ void display_private(char *rname, int req_pass)
        wprintf("\n<br /><br />");
 
        wprintf("<FORM METHOD=\"POST\" action=\"goto_private\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
        wprintf("<table border=\"0\" cellspacing=\"5\" "
                "cellpadding=\"5\" class=\"roomops_background_alt\">\n"
@@ -2274,6 +2368,7 @@ void display_zap(void)
                "to do?<br />\n"), WC->wc_roomname);
 
        wprintf("<FORM METHOD=\"POST\" action=\"zap\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
        wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
@@ -2343,6 +2438,7 @@ void netedit(void) {
        char cmpa1[SIZ];
        char cmpb0[SIZ];
        char cmpb1[SIZ];
+       int i, num_addrs;
 
        if (strlen(bstr("line"))==0) {
                display_editroom();
@@ -2394,7 +2490,22 @@ void netedit(void) {
        }
 
        if (strlen(bstr("add_button")) > 0) {
-               serv_puts(line);
+               num_addrs = num_tokens(bstr("line"), ',');
+               if (num_addrs < 2) {
+                       /* just adding one node or address */
+                       serv_puts(line);
+               }
+               else {
+                       /* adding multiple addresses separated by commas */
+                       for (i=0; i<num_addrs; ++i) {
+                               strcpy(line, bstr("prefix"));
+                               extract_token(buf, bstr("line"), i, ',', sizeof buf);
+                               striplt(buf);
+                               strcat(line, buf);
+                               strcat(line, bstr("suffix"));
+                               serv_puts(line);
+                       }
+               }
        }
 
        serv_puts("000");
@@ -2893,6 +3004,9 @@ void list_all_rooms_by_floor(char *viewpref) {
                ++num_floors;
        }
 
+       /** refresh the messages index for this room */
+//     serv_puts("GOTO ");
+//     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
        /** Now add rooms */
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
@@ -3073,5 +3187,4 @@ void set_room_policy(void) {
        display_editroom();
 }
 
-
 /*@}*/