X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=6fb8bafb43814103dba002f8bc4034e6c22040ab;hb=5ff52be939c2a41fcb0296df76e34a477c3a2576;hp=25943084df58bada7bf7e1ec34992c600a1c3959;hpb=41cf95bf582427abf8210f53def2258e23db7f83;p=citadel.git

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 25943084d..6fb8bafb4 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1,19 +1,17 @@
 /*
  * $Id$
+ * Lots of different room-related operations.
  */
-/**
- * \defgroup RoomOps Lots of different room-related operations.
- * \ingroup CitadelCommunitacion
- */
-/*@{*/
-#include "webcit.h"
 
-char floorlist[128][SIZ]; /**< list of our floor names */
+#include "webcit.h"
+#include "webserver.h"
+#define MAX_FLOORS 128
+char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
-char *viewdefs[8]; /**< the different kinds of available views */
+char *viewdefs[9]; /**< the different kinds of available views */
 
-/**
- * \brief initialize the viewdefs with localized strings
+/*
+ * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
 	viewdefs[0] = _("Bulletin Board");
@@ -24,12 +22,11 @@ void initialize_viewdefs(void) {
 	viewdefs[5] = _("Notes List");
 	viewdefs[6] = _("Wiki");
 	viewdefs[7] = _("Calendar List");
+	viewdefs[8] = _("Journal");
 }
 
-/**
- * \brief	Determine which views are allowed as the default for creating a new room.
- *
- * \param	which_view	The view ID being queried.
+/*
+ * Determine which views are allowed as the default for creating a new room.
  */
 int is_view_allowed_as_default(int which_view)
 {
@@ -40,22 +37,29 @@ int is_view_allowed_as_default(int which_view)
 		case VIEW_CALENDAR:	return(1);
 		case VIEW_TASKS:	return(1);
 		case VIEW_NOTES:	return(1);
-		case VIEW_WIKI:		return(0);	/**< because it isn't finished yet */
+
+#ifdef TECH_PREVIEW
+		case VIEW_WIKI:		return(1);
+#else /* TECH_PREVIEW */
+		case VIEW_WIKI:		return(0);	/* because it isn't finished yet */
+#endif /* TECH_PREVIEW */
+
 		case VIEW_CALBRIEF:	return(0);
-		default:		return(0);	/**< should never get here */
+		case VIEW_JOURNAL:	return(0);
+		default:		return(0);	/* should never get here */
 	}
 }
 
 
-/**
- * \brief load the list of floors
+/*
+ * load the list of floors
  */
 void load_floorlist(void)
 {
 	int a;
 	char buf[SIZ];
 
-	for (a = 0; a < 128; ++a)
+	for (a = 0; a < MAX_FLOORS; ++a)
 		floorlist[a][0] = 0;
 
 	serv_puts("LFLR");
@@ -70,10 +74,8 @@ void load_floorlist(void)
 }
 
 
-/**
- * \brief	Free a session's march list
- *
- * \param	wcf		Pointer to session being cleared
+/*
+ * Free a session's march list
  */
 void free_march_list(struct wcsession *wcf)
 {
@@ -89,8 +91,8 @@ void free_march_list(struct wcsession *wcf)
 
 
 
-/**
- * \brief remove a room from the march list
+/*
+ * remove a room from the march list
  */
 void remove_march(char *aaa)
 {
@@ -120,9 +122,8 @@ void remove_march(char *aaa)
 
 
 
-/**
- * \brief display rooms in tree structure???
- * \param rp the roomlist to build a tree from
+/*
+ * display rooms in tree structure
  */
 void room_tree_list(struct roomlisting *rp)
 {
@@ -151,7 +152,7 @@ void room_tree_list(struct roomlisting *rp)
 		wprintf(")");
 	else
 		wprintf("&gt;");
-	wprintf("</A><TT> </TT>\n");
+	wprintf("</a><tt> </tt>\n");
 
 	room_tree_list(rp->rnext);
 	free(rp);
@@ -253,9 +254,9 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
-	output_headers(1, 1, 0, 0, 0, 0);
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	svprintf("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
+	svput("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
 	do_template("beginbox");
 
 	listrms("LZRM -1");
@@ -325,44 +326,44 @@ void embed_room_graphic(void) {
 	serv_puts("OIMG _roompic_");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
-		wprintf("<IMG HEIGHT=64 src=\"image&name=_roompic_&room=");
+		wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
 		urlescputs(WC->wc_roomname);
 		wprintf("\">");
 		serv_puts("CLOS");
 		serv_getln(buf, sizeof buf);
 	}
 	else if (WC->wc_view == VIEW_ADDRESSBOOK) {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/viewcontacts_48x.gif"
 			"\">"
 		);
 	}
 	else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/calarea_48x.gif"
 			"\">"
 		);
 	}
 	else if (WC->wc_view == VIEW_TASKS) {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/taskmanag_48x.gif"
 			"\">"
 		);
 	}
 	else if (WC->wc_view == VIEW_NOTES) {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/storenotes_48x.gif"
 			"\">"
 		);
 	}
 	else if (WC->wc_view == VIEW_MAILBOX) {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/privatemess_48x.gif"
 			"\">"
 		);
 	}
 	else {
-		wprintf("<img height=48 width=48 src=\""
+		wprintf("<img class=\"roompic\" alt=\"\" src=\""
 			"static/chatrooms_48x.gif"
 			"\">"
 		);
@@ -378,8 +379,9 @@ void embed_room_graphic(void) {
 void embed_view_o_matic(void) {
 	int i;
 
-	wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
-		"<label for=\"view_name\">");
+	wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
+	wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+	wprintf("<label for=\"view_name\">");
 	wprintf(_("View as:"));
 	wprintf("</label> "
 		"<select name=\"newview\" size=\"1\" "
@@ -408,7 +410,7 @@ void embed_view_o_matic(void) {
 			wprintf("</option>\n");
 		}
 	}
-	wprintf("</select></form>\n");
+	wprintf("</select></div></form>\n");
 }
 
 
@@ -416,14 +418,16 @@ void embed_view_o_matic(void) {
  * \brief Display a search box
  */
 void embed_search_o_matic(void) {
-	wprintf("<form name=\"searchomatic\" action=\"do_search\">\n"
-		"<label for=\"search_name\">");
+	wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
+	wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+	wprintf("<label for=\"search_name\">");
 	wprintf(_("Search: "));
-	wprintf("</label> <input "
-		"type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
+	wprintf("</label><input ");
+	wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
+	wprintf("type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
 		"id=\"search_name\" class=\"inputbox\">\n"
 	);
-	wprintf("</select></form>\n");
+	wprintf("</div></form>\n");
 }
 
 
@@ -437,7 +441,11 @@ void embed_search_o_matic(void) {
 
 void embed_room_banner(char *got, int navbar_style) {
 	char buf[256];
-
+	char buf2[1024];
+	char sanitized_roomname[256];
+	char with_files[256];
+	int file_count=0;
+	
 	/**
 	 * We need to have the information returned by a GOTO server command.
 	 * If it isn't supplied, we fake it by issuing our own GOTO.
@@ -467,12 +475,28 @@ 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);
 
-	stresc(buf, WC->wc_roomname, 1, 1);
-	svprintf("ROOMNAME", WCS_STRING, "%s", buf);
-	svprintf("NUMMSGS", WCS_STRING,
-		_("%d new of %d messages"),
+	/* 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=\"display_room_directory\"> %d %s </a>", 
+			  file_count, 
+			  ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
+	}
+	else
+		strcpy (with_files, "");
+		
+	stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
+	svprintf(HKEY("ROOMNAME"), WCS_STRING, "%s", sanitized_roomname);
+	svprintf(HKEY("NUMMSGS"), WCS_STRING,
+		_("%d new of %d messages%s"),
 		extract_int(&got[4], 1),
-		extract_int(&got[4], 2)
+		extract_int(&got[4], 2),
+		with_files
 	);
 	svcallback("ROOMPIC", embed_room_graphic);
 	svcallback("ROOMINFO", readinfo);
@@ -488,7 +512,7 @@ void embed_room_banner(char *got, int navbar_style) {
 		if (navbar_style == navbar_default) wprintf(
 			"<li class=\"ungoto\">"
 			"<a href=\"ungoto\">"
-			"<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
+			"<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
 			"<span class=\"navbar_link\">%s</span></A>"
 			"</li>\n", _("Ungoto")
 		);
@@ -497,7 +521,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			wprintf(
 				"<li class=\"newmess\">"
 				"<a href=\"readnew\">"
-				"<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
+				"<img src=\"static/newmess2_24x.gif\" alt=\"\">"
 				"<span class=\"navbar_link\">%s</span></A>"
 				"</li>\n", _("Read new messages")
 			);
@@ -509,8 +533,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"viewcontacts\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/viewcontacts_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("View contacts")
@@ -520,8 +544,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"staskday\">"
 						"<a href=\"readfwd?calview=day\">"
-						"<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/taskday2_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Day view")
@@ -529,8 +553,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"monthview\">"
 						"<a href=\"readfwd?calview=month\">"
-						"<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/monthview2_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Month view")
@@ -540,8 +564,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"monthview\">"
 						"<a href=\"readfwd?calview=month\">"
-						"<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/monthview2_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Calendar list")
@@ -551,8 +575,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"taskmanag\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/taskmanag_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("View tasks")
@@ -562,8 +586,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"viewnotes\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/viewnotes_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("View notes")
@@ -573,8 +597,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"readallmess\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/readallmess3_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("View message list")
@@ -584,8 +608,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"readallmess\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/readallmess3_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Wiki home")
@@ -595,8 +619,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"readallmess\">"
 						"<a href=\"readfwd\">"
-						"<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-						"border=\"0\">"
+						"<img src=\"static/readallmess3_24x.gif\" "
+						"alt=\"\">"
 						"<span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Read all messages")
@@ -611,8 +635,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"addnewcontact\">"
 						"<a href=\"display_enter\">"
-						"<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img src=\"static/addnewcontact_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Add new contact")
 					);
@@ -620,12 +644,12 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_CALENDAR:
 				case VIEW_CALBRIEF:
 					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"));
+					if (havebstr("year" )) wprintf("?year=%s", bstr("year"));
+					if (havebstr("month")) wprintf("?month=%s", bstr("month"));
+					if (havebstr("day"  )) wprintf("?day=%s", bstr("day"));
 					wprintf("\">"
-						"<img align=\"middle\" src=\"static/addevent_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img  src=\"static/addevent_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Add new event")
 					);
@@ -634,8 +658,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"newmess\">"
 						"<a href=\"display_enter\">"
-						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img  src=\"static/newmess3_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Add new task")
 					);
@@ -643,9 +667,9 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_NOTES:
 					wprintf(
 						"<li class=\"enternewnote\">"
-						"<a href=\"javascript:add_new_note();\">"
-						"<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<a href=\"add_new_note\">"
+						"<img  src=\"static/enternewnote_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Add new note")
 					);
@@ -656,8 +680,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"newmess\">"
 						"<a href=\"display_enter?wikipage=%s\">"
-						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img  src=\"static/newmess3_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", buf, _("Edit this page")
 					);
@@ -666,8 +690,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"newmess\">"
 						"<a href=\"display_enter\">"
-						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img  src=\"static/newmess3_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Write mail")
 					);
@@ -676,8 +700,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					wprintf(
 						"<li class=\"newmess\">"
 						"<a href=\"display_enter\">"
-						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-						"border=\"0\"><span class=\"navbar_link\">"
+						"<img  src=\"static/newmess3_24x.gif\" "
+						"alt=\"\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></li>\n", _("Enter a message")
 					);
@@ -689,7 +713,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			"<li class=\"skipthisroom\">"
 			"<a href=\"skip\" "
 			"title=\"%s\">"
-			"<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
+			"<img  src=\"static/skipthisroom_24x.gif\" alt=\"\">"
 			"<span class=\"navbar_link\">%s</span></a>"
 			"</li>\n",
 			_("Leave all messages marked as unread, go to next room with unread messages"),
@@ -700,7 +724,7 @@ void embed_room_banner(char *got, int navbar_style) {
 			"<li class=\"markngo\">"
 			"<a href=\"gotonext\" "
 			"title=\"%s\">"
-			"<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
+			"<img  src=\"static/markngo_24x.gif\" alt=\"\">"
 			"<span class=\"navbar_link\">%s</span></a>"
 			"</li>\n",
 			_("Mark all messages as read, go to next room with unread messages"),
@@ -713,10 +737,8 @@ void embed_room_banner(char *got, int navbar_style) {
 }
 
 
-/**
- * \brief back end routine to take the session to a new room
- * \param gname room to go to
- *
+/*
+ * back end routine to take the session to a new room
  */
 int gotoroom(char *gname)
 {
@@ -724,7 +746,7 @@ int gotoroom(char *gname)
 	static long ls = (-1L);
 	int err = 0;
 
-	/** store ungoto information */
+	/* store ungoto information */
 	strcpy(WC->ugname, WC->wc_roomname);
 	WC->uglsn = ls;
 
@@ -810,8 +832,9 @@ char *pop_march(int desired_floor)
 
 
 
-/**
- *\brief Goto next room having unread messages.
+/*
+ * Goto next room having unread messages.
+ *
  * We want to skip over rooms that the user has already been to, and take the
  * user back to the lobby when done.  The room we end up in is placed in
  * newroom - which is set to 0 (the lobby) initially.
@@ -821,11 +844,13 @@ char *pop_march(int desired_floor)
 void gotonext(void)
 {
 	char buf[256];
-	struct march *mptr, *mptr2;
+	struct march *mptr = NULL;
+	struct march *mptr2 = NULL;
 	char room_name[128];
 	char next_room[128];
+	int ELoop = 0;
 
-	/**
+	/*
 	 * First check to see if the march-mode list is already allocated.
 	 * If it is, pop the first room off the list and go there.
 	 */
@@ -835,6 +860,14 @@ void gotonext(void)
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '1')
 			while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+				if (IsEmptyStr(buf)) {
+					if (ELoop > 10000)
+						return;
+					if (ELoop % 100 == 0)
+						sleeeeeeeeeep(1);
+					ELoop ++;
+					continue;					
+				}
 				extract_token(room_name, buf, 0, '|', sizeof room_name);
 				if (strcasecmp(room_name, WC->wc_roomname)) {
 					mptr = (struct march *) malloc(sizeof(struct march));
@@ -842,22 +875,22 @@ void gotonext(void)
 					safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
 					mptr->march_floor = extract_int(buf, 2);
 					mptr->march_order = extract_int(buf, 3);
-					if (WC->march == NULL) {
+					if (WC->march == NULL) 
 						WC->march = mptr;
-					} else {
-						mptr2 = WC->march;
-						while (mptr2->next != NULL)
-							mptr2 = mptr2->next;
+					else 
 						mptr2->next = mptr;
-					}
+					mptr2 = mptr;
 				}
+				buf[0] = '\0';
 			}
-		/**
+		/*
 		 * add _BASEROOM_ to the end of the march list, so the user will end up
 		 * in the system base room (usually the Lobby>) at the end of the loop
 		 */
 		mptr = (struct march *) malloc(sizeof(struct march));
 		mptr->next = NULL;
+		mptr->march_order = 0;
+	    	mptr->march_floor = 0;
 		strcpy(mptr->march_name, "_BASEROOM_");
 		if (WC->march == NULL) {
 			WC->march = mptr;
@@ -867,7 +900,7 @@ void gotonext(void)
 				mptr2 = mptr2->next;
 			mptr2->next = mptr;
 		}
-		/**
+		/*
 		 * ...and remove the room we're currently in, so a <G>oto doesn't make us
 		 * walk around in circles
 		 */
@@ -884,9 +917,8 @@ void gotonext(void)
 }
 
 
-/**
- * \brief goto next room
- * \param next_room next room to go to
+/*
+ * goto next room
  */
 void smart_goto(char *next_room) {
 	gotoroom(next_room);
@@ -895,8 +927,8 @@ void smart_goto(char *next_room) {
 
 
 
-/**
- * \brief mark all messages in current room as having been read
+/*
+ * mark all messages in current room as having been read
  */
 void slrp_highest(void)
 {
@@ -907,8 +939,8 @@ void slrp_highest(void)
 }
 
 
-/**
- * \brief un-goto the previous room
+/*
+ * un-goto the previous room
  */
 void ungoto(void)
 {
@@ -933,15 +965,25 @@ void ungoto(void)
 	smart_goto(buf);
 }
 
+typedef struct __room_states {
+	char password[SIZ];
+	char dirname[SIZ];
+	char name[SIZ];
+	int flags;
+	int floor;
+	int order;
+	int view;
+	int flags2;
+} room_states;
 
 
 
 
-/**
- * \brief Set/clear/read the "self-service list subscribe" flag for a room
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
  * 
- * \param newval set to 0 to clear, 1 to set, any other value to leave unchanged.
- * \return return the new value.
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
  */
 
 int self_service(int newval) {
@@ -951,7 +993,7 @@ int self_service(int newval) {
 	char name[SIZ];
 	char password[SIZ];
 	char dirname[SIZ];
-	int flags, floor, order, view, flags2;
+        int flags, floor, order, view, flags2;
 
 	serv_puts("GETR");
 	serv_getln(buf, sizeof buf);
@@ -994,13 +1036,71 @@ int self_service(int newval) {
 
 }
 
+int is_selflist(room_states *RoomFlags)
+{
+	return ((RoomFlags->flags2 & QR2_SELFLIST) != 0);
+}
 
+int is_publiclist(room_states *RoomFlags)
+{
+	return ((RoomFlags->flags2 & QR2_SMTP_PUBLIC) != 0);
+}
 
+int is_moderatedlist(room_states *RoomFlags)
+{
+	return ((RoomFlags->flags2 & QR2_MODERATED) != 0);
+}
 
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
+ * 
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
+ */
 
+int get_roomflags(room_states *RoomOps) 
+{
+	char buf[SIZ];
+	
+	serv_puts("GETR");
+	serv_getln(buf, sizeof buf);
+	if (buf[0] != '2') return(0);
 
-/**
- * \brief display the form for editing a room
+	extract_token(RoomOps->name, &buf[4], 0, '|', sizeof RoomOps->name);
+	extract_token(RoomOps->password, &buf[4], 1, '|', sizeof RoomOps->password);
+	extract_token(RoomOps->dirname, &buf[4], 2, '|', sizeof RoomOps->dirname);
+	RoomOps->flags = extract_int(&buf[4], 3);
+	RoomOps->floor = extract_int(&buf[4], 4);
+	RoomOps->order = extract_int(&buf[4], 5);
+	RoomOps->view = extract_int(&buf[4], 6);
+	RoomOps->flags2 = extract_int(&buf[4], 7);
+	return (1);
+}
+
+int set_roomflags(room_states *RoomOps)
+{
+	char buf[SIZ];
+
+	serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
+		    RoomOps->name, 
+		    RoomOps->password, 
+		    RoomOps->dirname, 
+		    RoomOps->flags,
+		    RoomOps->floor, 
+		    RoomOps->order, 
+		    RoomOps->view, 
+		    RoomOps->flags2);
+	serv_getln(buf, sizeof buf);
+	return (1);
+}
+
+
+
+
+
+
+/*
+ * display the form for editing a room
  */
 void display_editroom(void)
 {
@@ -1024,343 +1124,390 @@ void display_editroom(void)
 	int roomvalue = 0;
 	int floorpolicy = 0;
 	int floorvalue = 0;
+	char pop3_host[128];
+	char pop3_user[32];
+	int bg = 0;
 
 	tab = bstr("tab");
-	if (strlen(tab) == 0) tab = "admin";
+	if (IsEmptyStr(tab)) tab = "admin";
 
 	load_floorlist();
-	serv_puts("GETR");
-	serv_getln(buf, sizeof buf);
-
-	if (buf[0] != '2') {
-		strcpy(WC->ImportantMessage, &buf[4]);
-		display_main_menu();
-		return;
-	}
-	extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
-	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_floor = extract_int(&buf[4], 4);
-	er_flags2 = extract_int(&buf[4], 7);
-
 	output_headers(1, 1, 1, 0, 0, 0);
 
-	/** print the tabbed dialog */
-	wprintf("<br />"
-		"<div class=\"fix_scrollbar_bug\">"
-		"<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
-		"<TR ALIGN=CENTER>"
-		"<TD>&nbsp;</TD>\n");
+	wprintf("<div class=\"fix_scrollbar_bug\">");
 
-	if (!strcmp(tab, "admin")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=admin\">");
-	}
-	wprintf(_("Administration"));
-	if (!strcmp(tab, "admin")) {
-		wprintf("</SPAN></TD>\n");
-	}
-	else {
-		wprintf("</A></TD>\n");
-	}
+	wprintf("<br />\n");
 
-	wprintf("<TD>&nbsp;</TD>\n");
+	/* print the tabbed dialog */
+	wprintf("<div align=\"center\">");
+	wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\""
+		"<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
+		);
 
-	if (!strcmp(tab, "config")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=config\">");
-	}
-	wprintf(_("Configuration"));
-	if (!strcmp(tab, "config")) {
-		wprintf("</SPAN></TD>\n");
+	wprintf("<td class=\"");
+	if (!strcmp(tab, "admin")) {
+		wprintf(" tab_cell_label\">");
+		wprintf(_("Administration"));
 	}
 	else {
-		wprintf("</A></TD>\n");
+		wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+		wprintf(_("Administration"));
+		wprintf("</a>");
 	}
+	wprintf("</td>\n");
+	wprintf("<td>&nbsp;</td>\n");
 
-	wprintf("<TD>&nbsp;</TD>\n");
+	if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
 
-	if (!strcmp(tab, "expire")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=expire\">");
-	}
-	wprintf(_("Message expire policy"));
-	if (!strcmp(tab, "expire")) {
-		wprintf("</SPAN></TD>\n");
-	}
-	else {
-		wprintf("</A></TD>\n");
-	}
+		wprintf("<td class=\"");
+		if (!strcmp(tab, "config")) {
+			wprintf(" tab_cell_label\">");
+			wprintf(_("Configuration"));
+		}
+		else {
+			wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+			wprintf(_("Configuration"));
+			wprintf("</a>");
+		}
+		wprintf("</td>\n");
+		wprintf("<td>&nbsp;</td>\n");
 
-	wprintf("<TD>&nbsp;</TD>\n");
+		wprintf("<td class=\"");
+		if (!strcmp(tab, "expire")) {
+			wprintf(" tab_cell_label\">");
+			wprintf(_("Message expire policy"));
+		}
+		else {
+			wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+			wprintf(_("Message expire policy"));
+			wprintf("</a>");
+		}
+		wprintf("</td>\n");
+		wprintf("<td>&nbsp;</td>\n");
+	
+		wprintf("<td class=\"");
+		if (!strcmp(tab, "access")) {
+			wprintf(" tab_cell_label\">");
+			wprintf(_("Access controls"));
+		}
+		else {
+			wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+			wprintf(_("Access controls"));
+			wprintf("</a>");
+		}
+		wprintf("</td>\n");
+		wprintf("<td>&nbsp;</td>\n");
 
-	if (!strcmp(tab, "access")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=access\">");
-	}
-	wprintf(_("Access controls"));
-	if (!strcmp(tab, "access")) {
-		wprintf("</SPAN></TD>\n");
-	}
-	else {
-		wprintf("</A></TD>\n");
-	}
+		wprintf("<td class=\"");
+		if (!strcmp(tab, "sharing")) {
+			wprintf(" tab_cell_label\">");
+			wprintf(_("Sharing"));
+		}
+		else {
+			wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+			wprintf(_("Sharing"));
+			wprintf("</a>");
+		}
+		wprintf("</td>\n");
+		wprintf("<td>&nbsp;</td>\n");
 
-	wprintf("<TD>&nbsp;</TD>\n");
+		wprintf("<td class=\"");
+		if (!strcmp(tab, "listserv")) {
+			wprintf(" tab_cell_label\">");
+			wprintf(_("Mailing list service"));
+		}
+		else {
+			wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+			wprintf(_("Mailing list service"));
+			wprintf("</a>");
+		}
+		wprintf("</td>\n");
+		wprintf("<td>&nbsp;</td>\n");
 
-	if (!strcmp(tab, "sharing")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
 	}
-	wprintf(_("Sharing"));
-	if (!strcmp(tab, "sharing")) {
-		wprintf("</SPAN></TD>\n");
-	}
-	else {
-		wprintf("</A></TD>\n");
-	}
-
-	wprintf("<TD>&nbsp;</TD>\n");
 
-	if (!strcmp(tab, "listserv")) {
-		wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
-	}
-	else {
-		wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
-	}
-	wprintf(_("Mailing list service"));
-	if (!strcmp(tab, "listserv")) {
-		wprintf("</SPAN></TD>\n");
+	wprintf("<td class=\"");
+	if (!strcmp(tab, "feeds")) {
+		wprintf(" tab_cell_label\">");
+		wprintf(_("Remote retrieval"));
 	}
 	else {
-		wprintf("</A></TD>\n");
+		wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+		wprintf(_("Remote retrieval"));
+		wprintf("</a>");
 	}
+	wprintf("</td>\n");
+	wprintf("<td>&nbsp;</td>\n");
 
-	wprintf("<TD>&nbsp;</TD>\n");
+	wprintf("</tr></table>\n");
+	wprintf("</div>\n");
+	/* end tabbed dialog */	
 
-	wprintf("</TR></TABLE></div>\n");
-	/** end tabbed dialog */	
+	wprintf("<script type=\"text/javascript\">"
+		" Nifty(\"table#AdminTabs td\", \"small transparent top\");"
+		"</script>"
+	);
 
-	/** begin content of whatever tab is open now */
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<TABLE class=\"roomops_background\">\n"
-		"<TR><TD>\n");
+	/* begin content of whatever tab is open now */
 
 	if (!strcmp(tab, "admin")) {
-		wprintf("<UL>"
-			"<LI><a href=\"delete_room\" "
+		wprintf("<div class=\"tabcontent\">");
+		wprintf("<ul>"
+			"<li><a href=\"delete_room\" "
 			"onClick=\"return confirm('");
 		wprintf(_("Are you sure you want to delete this room?"));
 		wprintf("');\">\n");
 		wprintf(_("Delete this room"));
-		wprintf("</A>\n"
-			"<LI><a href=\"display_editroompic\">\n");
+		wprintf("</a>\n"
+			"<li><a href=\"display_editroompic\">\n");
 		wprintf(_("Set or change the icon for this room's banner"));
-		wprintf("</A>\n"
-			"<LI><a href=\"display_editinfo\">\n");
+		wprintf("</a>\n"
+			"<li><a href=\"display_editinfo\">\n");
 		wprintf(_("Edit this room's Info file"));
-		wprintf("</A>\n"
-			"</UL>");
+		wprintf("</a>\n"
+			"</ul>");
+		wprintf("</div>");
 	}
 
 	if (!strcmp(tab, "config")) {
-		wprintf("<FORM METHOD=\"POST\" action=\"editroom\">\n");
-	
-		wprintf("<UL><LI>");
-		wprintf(_("Name of room: "));
-		wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
-			er_name,
-			(sizeof(er_name)-1)
-		);
-	
-		wprintf("<LI>");
-		wprintf(_("Resides on floor: "));
-		wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
-		for (i = 0; i < 128; ++i)
-			if (strlen(floorlist[i]) > 0) {
-				wprintf("<OPTION ");
-				if (i == er_floor)
-					wprintf("SELECTED ");
-				wprintf("VALUE=\"%d\">", i);
-				escputs(floorlist[i]);
-				wprintf("</OPTION>\n");
-			}
-		wprintf("</SELECT>\n");
-	
-		wprintf("<LI>");
-		wprintf(_("Type of room:"));
-		wprintf("<UL>\n");
-
-		wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-		if ((er_flags & QR_PRIVATE) == 0)
-		wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Public (automatically appears to everyone)"));
-		wprintf("\n");
-
-		wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
-		if ((er_flags & QR_PRIVATE) &&
-		    (er_flags & QR_GUESSNAME))
-			wprintf("CHECKED ");
-		wprintf("> ");
-		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("\n<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
-			er_password);
-	
-		wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
-		if ((er_flags & QR_PRIVATE)
-		    && ((er_flags & QR_GUESSNAME) == 0)
-		    && ((er_flags & QR_PASSWORDED) == 0))
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Private - invitation only"));
-	
-		wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-		wprintf("> ");
-		wprintf(_("If private, cause current users to forget room"));
-	
-		wprintf("\n</UL>\n");
-	
-		wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
-		if (er_flags & QR_PREFONLY)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Preferred users only"));
-	
-		wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
-		if (er_flags & QR_READONLY)
-			wprintf("CHECKED ");
-		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)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("File directory room"));
+		wprintf("<div class=\"tabcontent\">");
+		serv_puts("GETR");
+		serv_getln(buf, sizeof buf);
 
-		wprintf("\n<UL><LI>");
-		wprintf(_("Directory name: "));
-		wprintf("<INPUT TYPE=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
-			er_dirname);
+		if (!strncmp(buf, "550", 3)) {
+			wprintf("<br><br><div align=center>%s</div><br><br>\n",
+				_("Higher access is required to access this function.")
+			);
+		}
+		else if (buf[0] != '2') {
+			wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+		}
+		else {
+			extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
+			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_floor = extract_int(&buf[4], 4);
+			er_flags2 = extract_int(&buf[4], 7);
+	
+			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: "));
+			wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+				er_name,
+				(sizeof(er_name)-1)
+			);
+		
+			wprintf("<li>");
+			wprintf(_("Resides on floor: "));
+			wprintf("<select NAME=\"er_floor\" SIZE=\"1\"");
+			if (er_flags & QR_MAILBOX)
+				wprintf("disabled >\n");
+			for (i = 0; i < 128; ++i)
+				if (!IsEmptyStr(floorlist[i])) {
+					wprintf("<OPTION ");
+					if (i == er_floor )
+						wprintf("SELECTED ");
+					wprintf("VALUE=\"%d\">", i);
+					escputs(floorlist[i]);
+					wprintf("</OPTION>\n");
+				}
+			wprintf("</select>\n");
 
-		wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
-		if (er_flags & QR_UPLOAD)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Uploading allowed"));
+			wprintf("<li>");
+			wprintf(_("Type of room:"));
+			wprintf("<ul>\n");
 	
-		wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
-		if (er_flags & QR_DOWNLOAD)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Downloading allowed"));
+			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+			if ((er_flags & (QR_PRIVATE + QR_MAILBOX)) == 0)
+				wprintf("CHECKED ");
+			wprintf("OnChange=\""
+				"	if (this.form.type[0].checked == true) {	"
+				"		this.form.er_floor.disabled = false;	"
+				"	}						"
+				"\"> ");
+			wprintf(_("Public (automatically appears to everyone)"));
+			wprintf("\n");
 	
-		wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
-		if (er_flags & QR_VISDIR)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Visible directory"));
-		wprintf("</UL>\n");
+			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+			if ((er_flags & QR_PRIVATE) &&
+		    	(er_flags & QR_GUESSNAME))
+				wprintf("CHECKED ");
+			wprintf(" OnChange=\""
+				"	if (this.form.type[1].checked == true) {	"
+				"		this.form.er_floor.disabled = false;	"
+				"	}						"
+				"\"> ");
+			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(" OnChange=\""
+				"	if (this.form.type[2].checked == true) {	"
+				"		this.form.er_floor.disabled = false;	"
+				"	}						"
+				"\"> ");
+			wprintf(_("Private - require password: "));
+			wprintf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+				er_password);
+		
+			wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
+			if ((er_flags & QR_PRIVATE)
+		    	&& ((er_flags & QR_GUESSNAME) == 0)
+		    	&& ((er_flags & QR_PASSWORDED) == 0))
+				wprintf("CHECKED ");
+			wprintf(" OnChange=\""
+				"	if (this.form.type[3].checked == true) {	"
+				"		this.form.er_floor.disabled = false;	"
+				"	}						"
+				"\"> ");
+			wprintf(_("Private - invitation only"));
+		
+			wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+			if (er_flags & QR_MAILBOX)
+				wprintf("CHECKED ");
+			wprintf (" OnChange=\""
+				"	if (this.form.type[4].checked == true) {	"
+				"		this.form.er_floor.disabled = true;	"
+				"	}						"
+				"\"> ");
+			wprintf(_("Personal (mailbox for you only)"));
+			
+			wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+			wprintf("> ");
+			wprintf(_("If private, cause current users to forget room"));
+		
+			wprintf("\n</ul>\n");
+		
+			wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+			if (er_flags & QR_PREFONLY)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Preferred users only"));
+		
+			wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+			if (er_flags & QR_READONLY)
+				wprintf("CHECKED ");
+			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)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("File directory room"));
 	
-		/** end of directory stuff */
+			wprintf("\n<ul><li>");
+			wprintf(_("Directory name: "));
+			wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+				er_dirname);
 	
-		wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
-		if (er_flags & QR_NETWORK)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Network shared room"));
-
-		wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
-		if (er_flags & QR_PERMANENT)
+			wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+			if (er_flags & QR_UPLOAD)
 			wprintf("CHECKED ");
-		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>");
-		wprintf(_("Anonymous messages"));
-		wprintf("<UL>\n");
+			wprintf("> ");
+			wprintf(_("Uploading allowed"));
+		
+			wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+			if (er_flags & QR_DOWNLOAD)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Downloading allowed"));
+		
+			wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+			if (er_flags & QR_VISDIR)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Visible directory"));
+			wprintf("</ul>\n");
+		
+			/** end of directory stuff */
 	
-		wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
-		if (((er_flags & QR_ANONONLY) == 0)
-		    && ((er_flags & QR_ANONOPT) == 0))
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("No anonymous messages"));
+			wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+			if (er_flags & QR_NETWORK)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Network shared room"));
 	
-		wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
-		if (er_flags & QR_ANONONLY)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("All messages are anonymous"));
+			wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+			if (er_flags & QR_PERMANENT)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Permanent (does not auto-purge)"));
 	
-		wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
-		if (er_flags & QR_ANONOPT)
-			wprintf("CHECKED ");
-		wprintf("> ");
-		wprintf(_("Prompt user when entering messages"));
-		wprintf("</UL>\n");
+			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)"));
 	
-	/* end of anon options */
+			/** start of anon options */
+		
+			wprintf("\n<li>");
+			wprintf(_("Anonymous messages"));
+			wprintf("<ul>\n");
+		
+			wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+			if (((er_flags & QR_ANONONLY) == 0)
+		    	&& ((er_flags & QR_ANONOPT) == 0))
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("No anonymous messages"));
 	
-		wprintf("<LI>");
-		wprintf(_("Room aide: "));
-		serv_puts("GETA");
-		serv_getln(buf, sizeof buf);
-		if (buf[0] != '2') {
-			wprintf("<em>%s</em>\n", &buf[4]);
-		} else {
-			extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
-			wprintf("<INPUT TYPE=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+			wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+			if (er_flags & QR_ANONONLY)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("All messages are anonymous"));
+		
+			wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+			if (er_flags & QR_ANONOPT)
+				wprintf("CHECKED ");
+			wprintf("> ");
+			wprintf(_("Prompt user when entering messages"));
+			wprintf("</ul>\n");
+		
+		/* end of anon options */
+		
+			wprintf("<li>");
+			wprintf(_("Room aide: "));
+			serv_puts("GETA");
+			serv_getln(buf, sizeof buf);
+			if (buf[0] != '2') {
+				wprintf("<em>%s</em>\n", &buf[4]);
+			} else {
+				extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
+				wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+			}
+		
+			wprintf("</ul><CENTER>\n");
+			wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
+				"<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+				"&nbsp;"
+				"<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+				"</CENTER>\n",
+				_("Save changes"),
+				_("Cancel")
+			);
 		}
-	
-		wprintf("</UL><CENTER>\n");
-		wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
-			"<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
-			"&nbsp;"
-			"<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
-			"</CENTER>\n",
-			_("Save changes"),
-			_("Cancel")
-		);
+		wprintf("</div>");
 	}
 
 
-	/** Sharing the room with other Citadel nodes... */
+	/* Sharing the room with other Citadel nodes... */
 	if (!strcmp(tab, "sharing")) {
+		wprintf("<div class=\"tabcontent\">");
 
 		shared_with = strdup("");
 		not_shared_with = strdup("");
@@ -1386,7 +1533,7 @@ void display_editroom(void)
 				shared_with = realloc(shared_with,
 						strlen(shared_with) + 32);
 				strcat(shared_with, node);
-				if (strlen(remote_room) > 0) {
+				if (!IsEmptyStr(remote_room)) {
 					strcat(shared_with, "|");
 					strcat(shared_with, remote_room);
 				}
@@ -1405,121 +1552,122 @@ void display_editroom(void)
 			}
 		}
 
-		/** Display the stuff */
+		/* Display the stuff */
 		wprintf("<CENTER><br />"
-			"<TABLE border=1 cellpadding=5><TR>"
-			"<TD><B><I>");
+			"<table border=1 cellpadding=5><tr>"
+			"<td><B><I>");
 		wprintf(_("Shared with"));
-		wprintf("</I></B></TD>"
-			"<TD><B><I>");
+		wprintf("</I></B></td>"
+			"<td><B><I>");
 		wprintf(_("Not shared with"));
-		wprintf("</I></B></TD></TR>\n"
-			"<TR><TD VALIGN=TOP>\n");
+		wprintf("</I></B></td></tr>\n"
+			"<tr><td VALIGN=TOP>\n");
 
-		wprintf("<TABLE border=0 cellpadding=5><TR class=\"roomops_cell\"><TD>");
+		wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
 		wprintf(_("Remote node name"));
-		wprintf("</TD><TD>");
+		wprintf("</td><td>");
 		wprintf(_("Remote room name"));
-		wprintf("</TD><TD>");
+		wprintf("</td><td>");
 		wprintf(_("Actions"));
-		wprintf("</TD></TR>\n");
+		wprintf("</td></tr>\n");
 
 		for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
 			extract_token(buf, shared_with, i, '\n', sizeof buf);
 			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);
+			if (!IsEmptyStr(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) {
+				wprintf("<td>");
+				if (!IsEmptyStr(remote_room)) {
 					escputs(remote_room);
 				}
-				wprintf("</TD>");
+				wprintf("</td>");
 
-				wprintf("<TD>");
+				wprintf("<td>");
 		
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"line\" "
+				wprintf("<input type=\"hidden\" NAME=\"line\" "
 					"VALUE=\"ignet_push_share|");
 				urlescputs(node);
-				if (strlen(remote_room) > 0) {
+				if (!IsEmptyStr(remote_room)) {
 					wprintf("|");
 					urlescputs(remote_room);
 				}
 				wprintf("\">");
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
-					"VALUE=\"sharing\">\n");
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
-					"VALUE=\"remove\">\n");
-				wprintf("<INPUT TYPE=\"submit\" "
+				wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
+				wprintf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
+				wprintf("<input type=\"submit\" "
 					"NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
-				wprintf("</TD></TR></FORM>\n");
+				wprintf("</td></tr></form>\n");
 			}
 		}
 
-		wprintf("</TABLE>\n");
-		wprintf("</TD><TD VALIGN=TOP>\n");
-		wprintf("<TABLE border=0 cellpadding=5><TR class=\"roomops_cell\"><TD>");
+		wprintf("</table>\n");
+		wprintf("</td><td VALIGN=TOP>\n");
+		wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
 		wprintf(_("Remote node name"));
-		wprintf("</TD><TD>");
+		wprintf("</td><td>");
 		wprintf(_("Remote room name"));
-		wprintf("</TD><TD>");
+		wprintf("</td><td>");
 		wprintf(_("Actions"));
-		wprintf("</TD></TR>\n");
+		wprintf("</td></tr>\n");
 
 		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>");
+			if (!IsEmptyStr(node)) {
+				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\" "
+				wprintf("</td><td>"
+					"<input type=\"INPUT\" "
 					"NAME=\"suffix\" "
 					"MAXLENGTH=128>"
-					"</TD><TD>");
-				wprintf("<INPUT TYPE=\"hidden\" "
+					"</td><td>");
+				wprintf("<input type=\"hidden\" "
 					"NAME=\"line\" "
 					"VALUE=\"ignet_push_share|");
 				urlescputs(node);
 				wprintf("|\">");
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
+				wprintf("<input type=\"hidden\" NAME=\"tab\" "
 					"VALUE=\"sharing\">\n");
-				wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
+				wprintf("<input type=\"hidden\" NAME=\"cmd\" "
 					"VALUE=\"add\">\n");
-				wprintf("<INPUT TYPE=\"submit\" "
+				wprintf("<input type=\"submit\" "
 					"NAME=\"add_button\" VALUE=\"%s\">", _("Share"));
-				wprintf("</TD></TR></FORM>\n");
+				wprintf("</td></tr></form>\n");
 			}
 		}
 
-		wprintf("</TABLE>\n");
-		wprintf("</TD></TR>"
-			"</TABLE></CENTER><br />\n"
-			"<I><B>%s</B><UL><LI>", _("Notes:"));
+		wprintf("</table>\n");
+		wprintf("</td></tr>"
+			"</table></CENTER><br />\n"
+			"<I><B>%s</B><ul><li>", _("Notes:"));
 		wprintf(_("When sharing a room, "
 			"it must be shared from both ends.  Adding a node to "
 			"the 'shared' list sends messages out, but in order to"
 			" receive messages, the other nodes must be configured"
 			" to send messages out to your system as well. "
-			"<LI>If the remote room name is blank, it is assumed "
+			"<li>If the remote room name is blank, it is assumed "
 			"that the room name is identical on the remote node."
-			"<LI>If the remote room name is different, the remote "
+			"<li>If the remote room name is different, the remote "
 			"node must also configure the name of the room here."
-			"</UL></I><br />\n"
+			"</ul></I><br />\n"
 		));
 
+		wprintf("</div>");
 	}
 
-	/** Mailing list management */
+	/* Mailing list management */
 	if (!strcmp(tab, "listserv")) {
+		room_states RoomFlags;
+		wprintf("<div class=\"tabcontent\">");
 
 		wprintf("<br /><center>"
-			"<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
-			"<TR><TD VALIGN=TOP>");
+			"<table BORDER=0 WIDTH=100%% CELLPADDING=5>"
+			"<tr><td VALIGN=TOP>");
 
 		wprintf(_("<i>The contents of this room are being "
 			"mailed <b>as individual messages</b> "
@@ -1541,14 +1689,15 @@ void display_editroom(void)
 				wprintf("</A><br />");
 			}
 		}
-		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\" id=\"add_as_listrecp\" NAME=\"line\">\n");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-		wprintf("</FORM>\n");
-
-		wprintf("</TD><TD VALIGN=TOP>\n");
+		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=\"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");
+
+		wprintf("</td><td VALIGN=TOP>\n");
 		
 		wprintf(_("<i>The contents of this room are being "
 			"mailed <b>in digest form</b> "
@@ -1571,14 +1720,15 @@ void display_editroom(void)
 				wprintf("</A><br />");
 			}
 		}
-		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\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-		wprintf("</FORM>\n");
+		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=\"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>\n");
+		wprintf("</td></tr></table>\n");
 
 		/** Pop open an address book -- begin **/
 		wprintf("<div align=right>"
@@ -1592,148 +1742,339 @@ void display_editroom(void)
 			_("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."));
-			wprintf("<a href=\"toggle_self_service?newval=0&tab=listserv\">");
-			wprintf(_("Click to disable."));
-			wprintf("</A><br />\n");
-			wprintf(_("The URL for subscribe/unsubscribe is: "));
-			wprintf("<TT>%s://%s/listsub</TT><br />\n",
-				(is_https ? "https" : "http"),
-				WC->http_host);
-		}
-		else {
-			wprintf(_("This room is <i>not</i> configured to allow "
-				"self-service subscribe/unsubscribe requests."));
-			wprintf(" <a href=\"toggle_self_service?newval=1&"
-				"tab=listserv\">");
-			wprintf(_("Click to enable."));
-			wprintf("</A><br />\n");
-		}
+		/* Pop open an address book -- end **/
+
+		wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+
+		get_roomflags (&RoomFlags);
+		
+		/* Self Service subscription? */
+		wprintf("<table><tr><td>\n");
+		wprintf(_("Allow self-service subscribe/unsubscribe requests."));
+		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+			" <tr><td colspan=\"2\">\n",
+			(is_selflist(&RoomFlags))?"checked":"");
+		wprintf(_("The URL for subscribe/unsubscribe is: "));
+		wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+			(is_https ? "https" : "http"),
+			WC->http_host);
+		/* Public posting? */
+		wprintf("<tr><td>");
+		wprintf(_("Allow non-subscribers to mail to this room."));
+		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+			(is_publiclist(&RoomFlags))?"checked":"");
+		
+		/* Moderated List? */
+		wprintf("<tr><td>");
+		wprintf(_("Room post publication needs Aide permission."));
+		wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+			(is_moderatedlist(&RoomFlags))?"checked":"");
 
 
+		wprintf("<tr><td colspan=\"2\" align=\"center\">"
+			"<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
+		wprintf("</table></form>");
+			
+
 		wprintf("</CENTER>\n");
+		wprintf("</div>");
 	}
 
 
-	/** Mailing list management */
+	/* Configuration of The Dreaded Auto-Purger */
 	if (!strcmp(tab, "expire")) {
+		wprintf("<div class=\"tabcontent\">");
 
 		serv_puts("GPEX room");
 		serv_getln(buf, sizeof buf);
-		if (buf[0] == '2') {
-			roompolicy = extract_int(&buf[4], 0);
-			roomvalue = extract_int(&buf[4], 1);
+		if (!strncmp(buf, "550", 3)) {
+			wprintf("<br><br><div align=center>%s</div><br><br>\n",
+				_("Higher access is required to access this function.")
+			);
 		}
-		
-		serv_puts("GPEX floor");
-		serv_getln(buf, sizeof buf);
-		if (buf[0] == '2') {
-			floorpolicy = extract_int(&buf[4], 0);
-			floorvalue = extract_int(&buf[4], 1);
+		else if (buf[0] != '2') {
+			wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
 		}
+		else {
+			roompolicy = extract_int(&buf[4], 0);
+			roomvalue = extract_int(&buf[4], 1);
 		
-		wprintf("<br /><FORM METHOD=\"POST\" action=\"set_room_policy\">\n");
-		wprintf("<TABLE border=0 cellspacing=5>\n");
-		wprintf("<TR><TD>");
-		wprintf(_("Message expire policy for this room"));
-		wprintf("<br />(");
-		escputs(WC->wc_roomname);
-		wprintf(")</TD><TD>");
-		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
-			((roompolicy == 0) ? "CHECKED" : "") );
-		wprintf(_("Use the default policy for this floor"));
-		wprintf("<br />\n");
-		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
-			((roompolicy == 1) ? "CHECKED" : "") );
-		wprintf(_("Never automatically expire messages"));
-		wprintf("<br />\n");
-		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
-			((roompolicy == 2) ? "CHECKED" : "") );
-		wprintf(_("Expire by message count"));
-		wprintf("<br />\n");
-		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
-			((roompolicy == 3) ? "CHECKED" : "") );
-		wprintf(_("Expire by message age"));
-		wprintf("<br />");
-		wprintf(_("Number of messages or days: "));
-		wprintf("<INPUT TYPE=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
-		wprintf("</TD></TR>\n");
-
-		if (WC->axlevel >= 6) {
-			wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
-			wprintf("<TR><TD>");
-			wprintf(_("Message expire policy for this floor"));
+			serv_puts("GPEX floor");
+			serv_getln(buf, sizeof buf);
+			if (buf[0] == '2') {
+				floorpolicy = extract_int(&buf[4], 0);
+				floorvalue = extract_int(&buf[4], 1);
+			}
+			
+			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"));
 			wprintf("<br />(");
-			escputs(floorlist[WC->wc_floor]);
-			wprintf(")</TD><TD>");
-			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
-				((floorpolicy == 0) ? "CHECKED" : "") );
-			wprintf(_("Use the system default"));
+			escputs(WC->wc_roomname);
+			wprintf(")</td><td>");
+			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+				((roompolicy == 0) ? "CHECKED" : "") );
+			wprintf(_("Use the default policy for this floor"));
 			wprintf("<br />\n");
-			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
-				((floorpolicy == 1) ? "CHECKED" : "") );
+			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+				((roompolicy == 1) ? "CHECKED" : "") );
 			wprintf(_("Never automatically expire messages"));
 			wprintf("<br />\n");
-			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
-				((floorpolicy == 2) ? "CHECKED" : "") );
+			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+				((roompolicy == 2) ? "CHECKED" : "") );
 			wprintf(_("Expire by message count"));
 			wprintf("<br />\n");
-			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
-				((floorpolicy == 3) ? "CHECKED" : "") );
+			wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+				((roompolicy == 3) ? "CHECKED" : "") );
 			wprintf(_("Expire by message age"));
 			wprintf("<br />");
 			wprintf(_("Number of messages or days: "));
-			wprintf("<INPUT TYPE=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
-				floorvalue);
+			wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+			wprintf("</td></tr>\n");
+	
+			if (WC->axlevel >= 6) {
+				wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+				wprintf("<tr><td>");
+				wprintf(_("Message expire policy for this floor"));
+				wprintf("<br />(");
+				escputs(floorlist[WC->wc_floor]);
+				wprintf(")</td><td>");
+				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
+					((floorpolicy == 0) ? "CHECKED" : "") );
+				wprintf(_("Use the system default"));
+				wprintf("<br />\n");
+				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+					((floorpolicy == 1) ? "CHECKED" : "") );
+				wprintf(_("Never automatically expire messages"));
+				wprintf("<br />\n");
+				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+					((floorpolicy == 2) ? "CHECKED" : "") );
+				wprintf(_("Expire by message count"));
+				wprintf("<br />\n");
+				wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+					((floorpolicy == 3) ? "CHECKED" : "") );
+				wprintf(_("Expire by message age"));
+				wprintf("<br />");
+				wprintf(_("Number of messages or days: "));
+				wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
+					floorvalue);
+			}
+	
+			wprintf("<CENTER>\n");
+			wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
+			wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
+			wprintf("&nbsp;");
+			wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+			wprintf("</CENTER></td><tr>\n");
+	
+			wprintf("</table>\n"
+				"<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
+				"</form>\n"
+			);
 		}
 
-		wprintf("<CENTER>\n");
-		wprintf("<TR><TD COLSPAN=2><hr /><CENTER>\n");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
-		wprintf("&nbsp;");
-		wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-		wprintf("</CENTER></TD><TR>\n");
-
-		wprintf("</TABLE>\n"
-			"<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
-			"</FORM>\n"
-		);
-
+		wprintf("</div>");
 	}
 
-	/** Mailing list management */
+	/* Access controls */
 	if (!strcmp(tab, "access")) {
+		wprintf("<div class=\"tabcontent\">");
 		display_whok();
+		wprintf("</div>");
+	}
+
+	/* Fetch messages from remote locations */
+	if (!strcmp(tab, "feeds")) {
+		wprintf("<div class=\"tabcontent\">");
+
+		wprintf("<i>");
+		wprintf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
+		wprintf("</i><br />\n");
+
+		wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+			"<tr class=\"even\"><th>");
+		wprintf(_("Remote host"));
+		wprintf("</th><th>");
+		wprintf(_("User name"));
+		wprintf("</th><th>");
+		wprintf(_("Password"));
+		wprintf("</th><th>");
+		wprintf(_("Keep messages on server?"));
+		wprintf("</th><th>");
+		wprintf(_("Interval"));
+		wprintf("</th><th> </th></tr>");
+
+		serv_puts("GNET");
+		serv_getln(buf, sizeof buf);
+		bg = 1;
+		if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			extract_token(cmd, buf, 0, '|', sizeof cmd);
+			if (!strcasecmp(cmd, "pop3client")) {
+				safestrncpy(recp, &buf[11], sizeof recp);
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
+
+				wprintf("<td>");
+				extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+				escputs(pop3_host);
+				wprintf("</td>");
+
+				wprintf("<td>");
+				extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
+				escputs(pop3_user);
+				wprintf("</td>");
+
+				wprintf("<td>*****</td>");		/* Don't show the password */
+
+				wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+
+				wprintf("<td>%ld</td>", extract_long(buf, 5));	// Fetching interval
+			
+				wprintf("<td class=\"button_link\">");
+				wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+				urlescputs(recp);
+				wprintf("\">");
+				wprintf(_("(remove)"));
+				wprintf("</a></td>");
+			
+				wprintf("</tr>");
+			}
+		}
+
+		wprintf("<form method=\"POST\" action=\"netedit\">\n"
+			"<tr>"
+			"<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+			"<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
+		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+		wprintf("<td>");
+		wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+		wprintf("</td></tr>");
+		wprintf("</form></table>\n");
+
+		wprintf("<hr>\n");
+
+		wprintf("<i>");
+		wprintf(_("Fetch the following RSS feeds and store them in this room:"));
+		wprintf("</i><br />\n");
+
+		wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+			"<tr class=\"even\"><th>");
+		wprintf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
+		wprintf(_("Feed URL"));
+		wprintf("</th><th>");
+		wprintf("</th></tr>");
+
+		serv_puts("GNET");
+		serv_getln(buf, sizeof buf);
+		bg = 1;
+		if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			extract_token(cmd, buf, 0, '|', sizeof cmd);
+			if (!strcasecmp(cmd, "rssclient")) {
+				safestrncpy(recp, &buf[10], sizeof recp);
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
+
+				wprintf("<td>");
+				extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+				escputs(pop3_host);
+				wprintf("</td>");
+
+				wprintf("<td class=\"button_link\">");
+				wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+				urlescputs(recp);
+				wprintf("\">");
+				wprintf(_("(remove)"));
+				wprintf("</a></td>");
+			
+				wprintf("</tr>");
+			}
+		}
+
+		wprintf("<form method=\"POST\" action=\"netedit\">\n"
+			"<tr>"
+			"<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+			"<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
+		wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+		wprintf("<td>");
+		wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
+			"maxlength=\"256\" name=\"line_pop3host\">\n");
+		wprintf("</td>");
+		wprintf("<td>");
+		wprintf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
+		wprintf("</td></tr>");
+		wprintf("</form></table>\n");
+
+		wprintf("</div>");
 	}
 
-	/** end content of whatever tab is open now */
-	wprintf("</TD></TR></TABLE></div>\n");
+
+	/* end content of whatever tab is open now */
+	wprintf("</div>\n");
 
 	address_book_popup();
 	wDumpContent(1);
 }
 
 
-/** 
- * \brief Toggle self-service list subscription
+/* 
+ * Toggle self-service list subscription
  */
 void toggle_self_service(void) {
-	int newval = 0;
+	room_states RoomFlags;
+
+	get_roomflags (&RoomFlags);
+
+	if (yesbstr("QR2_SelfList")) 
+		RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
+	else 
+		RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SELFLIST;
 
-	newval = atoi(bstr("newval"));
-	self_service(newval);
+	if (yesbstr("QR2_SMTP_PUBLIC")) 
+		RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+	else
+		RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+
+	if (yesbstr("QR2_Moderated")) 
+		RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
+	else
+		RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_MODERATED;
+	if (yesbstr("QR2_SubsOnly")) 
+		RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+	else
+		RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+
+	set_roomflags (&RoomFlags);
+	
 	display_editroom();
 }
 
 
 
-/**
- * \brief save new parameters for a room
+/*
+ * save new parameters for a room
  */
 void editroom(void)
 {
@@ -1750,7 +2091,7 @@ void editroom(void)
 	int bump;
 
 
-	if (strlen(bstr("ok_button")) == 0) {
+	if (!havebstr("ok_button")) {
 		strcpy(WC->ImportantMessage,
 			_("Cancelled.  Changes were not saved."));
 		display_editroom();
@@ -1773,7 +2114,7 @@ void editroom(void)
 	er_flags2 = extract_int(&buf[4], 7);
 
 	strcpy(er_roomaide, bstr("er_roomaide"));
-	if (strlen(er_roomaide) == 0) {
+	if (IsEmptyStr(er_roomaide)) {
 		serv_puts("GETA");
 		serv_getln(buf, sizeof buf);
 		if (buf[0] != '2') {
@@ -1784,18 +2125,18 @@ void editroom(void)
 	}
 	strcpy(buf, bstr("er_name"));
 	buf[128] = 0;
-	if (strlen(buf) > 0) {
+	if (!IsEmptyStr(buf)) {
 		strcpy(er_name, buf);
 	}
 
 	strcpy(buf, bstr("er_password"));
 	buf[10] = 0;
-	if (strlen(buf) > 0)
+	if (!IsEmptyStr(buf))
 		strcpy(er_password, buf);
 
 	strcpy(buf, bstr("er_dirname"));
 	buf[15] = 0;
-	if (strlen(buf) > 0)
+	if (!IsEmptyStr(buf))
 		strcpy(er_dirname, buf);
 
 	strcpy(buf, bstr("type"));
@@ -1810,61 +2151,68 @@ void editroom(void)
 	if (!strcmp(buf, "passworded")) {
 		er_flags |= (QR_PRIVATE | QR_PASSWORDED);
 	}
-	if (!strcmp(bstr("prefonly"), "yes")) {
+	if (!strcmp(buf, "personal")) {
+		er_flags |= QR_MAILBOX;
+	} else {
+		er_flags &= ~QR_MAILBOX;
+	}
+	
+	if (yesbstr("prefonly")) {
 		er_flags |= QR_PREFONLY;
 	} else {
 		er_flags &= ~QR_PREFONLY;
 	}
 
-	if (!strcmp(bstr("readonly"), "yes")) {
+	if (yesbstr("readonly")) {
 		er_flags |= QR_READONLY;
 	} else {
 		er_flags &= ~QR_READONLY;
 	}
 
-	if (!strcmp(bstr("collabdel"), "yes")) {
+	
+	if (yesbstr("collabdel")) {
 		er_flags2 |= QR2_COLLABDEL;
 	} else {
 		er_flags2 &= ~QR2_COLLABDEL;
 	}
 
-	if (!strcmp(bstr("permanent"), "yes")) {
+	if (yesbstr("permanent")) {
 		er_flags |= QR_PERMANENT;
 	} else {
 		er_flags &= ~QR_PERMANENT;
 	}
 
-	if (!strcmp(bstr("subjectreq"), "yes")) {
+	if (yesbstr("subjectreq")) {
 		er_flags2 |= QR2_SUBJECTREQ;
 	} else {
 		er_flags2 &= ~QR2_SUBJECTREQ;
 	}
 
-	if (!strcmp(bstr("network"), "yes")) {
+	if (yesbstr("network")) {
 		er_flags |= QR_NETWORK;
 	} else {
 		er_flags &= ~QR_NETWORK;
 	}
 
-	if (!strcmp(bstr("directory"), "yes")) {
+	if (yesbstr("directory")) {
 		er_flags |= QR_DIRECTORY;
 	} else {
 		er_flags &= ~QR_DIRECTORY;
 	}
 
-	if (!strcmp(bstr("ulallowed"), "yes")) {
+	if (yesbstr("ulallowed")) {
 		er_flags |= QR_UPLOAD;
 	} else {
 		er_flags &= ~QR_UPLOAD;
 	}
 
-	if (!strcmp(bstr("dlallowed"), "yes")) {
+	if (yesbstr("dlallowed")) {
 		er_flags |= QR_DOWNLOAD;
 	} else {
 		er_flags &= ~QR_DOWNLOAD;
 	}
 
-	if (!strcmp(bstr("visdir"), "yes")) {
+	if (yesbstr("visdir")) {
 		er_flags |= QR_VISDIR;
 	} else {
 		er_flags &= ~QR_VISDIR;
@@ -1882,7 +2230,7 @@ void editroom(void)
 	if (!strcmp(bstr("bump"), "yes"))
 		bump = 1;
 
-	er_floor = atoi(bstr("er_floor"));
+	er_floor = ibstr("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,
@@ -1896,7 +2244,7 @@ void editroom(void)
 	}
 	gotoroom(er_name);
 
-	if (strlen(er_roomaide) > 0) {
+	if (!IsEmptyStr(er_roomaide)) {
 		sprintf(buf, "SETA %s", er_roomaide);
 		serv_puts(buf);
 		serv_getln(buf, sizeof buf);
@@ -1913,8 +2261,8 @@ void editroom(void)
 }
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void do_invt_kick(void) {
         char buf[SIZ], room[SIZ], username[SIZ];
@@ -1930,7 +2278,7 @@ void do_invt_kick(void) {
 
         strcpy(username, bstr("username"));
 
-        if (strlen(bstr("kick_button")) > 0) {
+        if (havebstr("kick_button")) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1944,7 +2292,7 @@ void do_invt_kick(void) {
                 }
         }
 
-	if (strlen(bstr("invite_button")) > 0) {
+	if (havebstr("invite_button")) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1963,8 +2311,8 @@ void do_invt_kick(void) {
 
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void display_whok(void)
 {
@@ -1980,15 +2328,16 @@ void display_whok(void)
         extract_token(room, &buf[4], 0, '|', sizeof room);
 
         
-	wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>");
+	wprintf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
 	wprintf(_("The users listed below have access to this room.  "
 		"To remove a user from the access list, select the user "
 		"name from the list and click 'Kick'."));
 	wprintf("<br /><br />");
 	
-        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-        wprintf("<SELECT NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
+        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");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
@@ -1999,33 +2348,45 @@ void display_whok(void)
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><br />\n");
+        wprintf("</select><br />\n");
 
         wprintf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
-        wprintf("</FORM></CENTER>\n");
+        wprintf("</form></CENTER>\n");
 
-	wprintf("</TD><TD>");
+	wprintf("</td><td>");
 	wprintf(_("To grant another user access to this room, enter the "
 		"user name in the box below and click 'Invite'."));
 	wprintf("<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+        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"
+        wprintf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
         	"<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
         	"<input type=\"submit\" value=\"%s\">"
-		"</FORM></CENTER>\n", _("Invite"));
+		"</form></CENTER>\n", _("Invite"));
+		/* Pop open an address book -- begin **/
+		wprintf(
+			"<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
+			"title=\"%s\">"
+			"<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+			"&nbsp;%s</a>",
+			_("User"), 
+			_("Users"), _("Users")
+		);
+		/* Pop open an address book -- end **/
 
-	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</td></tr></table>\n");
+	address_book_popup();
         wDumpContent(1);
 }
 
 
 
-/**
- * \brief display the form for entering a new room
+/*
+ * display the form for entering a new room
  */
 void display_entroom(void)
 {
@@ -2041,47 +2402,47 @@ void display_entroom(void)
 		return;
 	}
 
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE class=\"roomops_banner\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">");
-	wprintf(_("Create a new room"));
-	wprintf("</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table class=\"roomops_background\"><tr><td>\n");
+	svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
+	do_template("beginbox");
 
 	wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+
+	wprintf("<table class=\"altern\"> ");
 
-	wprintf("<UL><LI>");
+	wprintf("<tr class=\"even\"><td>");
 	wprintf(_("Name of room: "));
-	wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+	wprintf("</td><td>");
+	wprintf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+        wprintf("</td></tr>");
 
-        wprintf("<LI>");
+	wprintf("<tr class=\"odd\"><td>");
 	wprintf(_("Resides on floor: "));
+	wprintf("</td><td>");
         load_floorlist(); 
-        wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
+        wprintf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
-                if (strlen(floorlist[i]) > 0) {
-                        wprintf("<OPTION ");
-                        wprintf("VALUE=\"%d\">", i);
+                if (!IsEmptyStr(floorlist[i])) {
+                        wprintf("<option ");
+                        wprintf("value=\"%d\">", i);
                         escputs(floorlist[i]);
-                        wprintf("</OPTION>\n");
+                        wprintf("</option>\n");
                 }
-        wprintf("</SELECT>\n");
+        wprintf("</select>\n");
+        wprintf("</td></tr>");
 
-		/**
+		/*
 		 * Our clever little snippet of JavaScript automatically selects
 		 * a public room if the view is set to Bulletin Board or wiki, and
 		 * it selects a mailbox room otherwise.  The user can override this,
 		 * of course.  We also disable the floor selector for mailboxes.
 		 */
-		wprintf("<LI>");
-		wprintf(_("Default view for room: "));
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\" OnChange=\""
+	wprintf("<tr class=\"even\"><td>");
+	wprintf(_("Default view for room: "));
+	wprintf("</td><td>");
+        wprintf("<select name=\"er_view\" size=\"1\" OnChange=\""
 		"	if ( (this.form.er_view.value == 0)		"
 		"	   || (this.form.er_view.value == 6) ) {	"
 		"		this.form.type[0].checked=true;		"
@@ -2094,78 +2455,88 @@ void display_entroom(void)
 		"\">\n");
 	for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
 		if (is_view_allowed_as_default(i)) {
-			wprintf("<OPTION %s VALUE=\"%d\">",
-				((i == 0) ? "SELECTED" : ""), i );
+			wprintf("<option %s value=\"%d\">",
+				((i == 0) ? "selected" : ""), i );
 			escputs(viewdefs[i]);
-			wprintf("</OPTION>\n");
+			wprintf("</option>\n");
 		}
 	}
-	wprintf("</SELECT>\n");
+	wprintf("</select>\n");
+	wprintf("</td></tr>");
 
-	wprintf("<LI>");
+	wprintf("<tr class=\"even\"><td>");
 	wprintf(_("Type of room:"));
-	wprintf("<UL>\n");
+	wprintf("</td><td>");
+	wprintf("<ul class=\"adminlist\">\n");
 
-	wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+	wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
 	wprintf("CHECKED OnChange=\""
 		"	if (this.form.type[0].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
 	wprintf(_("Public (automatically appears to everyone)"));
+	wprintf("</li>");
 
-	wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
+	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
 		"	if (this.form.type[1].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
 	wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+	wprintf("</li>");
 
-	wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
+	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
 		"	if (this.form.type[2].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
 	wprintf(_("Private - require password: "));
-	wprintf("<INPUT TYPE=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+	wprintf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+	wprintf("</li>");
 
-	wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
+	wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
 		"	if (this.form.type[3].checked == true) {	"
 		"		this.form.er_floor.disabled = false;	"
 		"	}						"
 		"\"> ");
 	wprintf(_("Private - invitation only"));
+	wprintf("</li>");
 
-	wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" "
+	wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
 		"OnChange=\""
 		"	if (this.form.type[4].checked == true) {	"
 		"		this.form.er_floor.disabled = true;	"
 		"	}						"
 		"\"> ");
 	wprintf(_("Personal (mailbox for you only)"));
+	wprintf("</li>");
 
-	wprintf("\n</UL>\n");
+	wprintf("\n</ul>\n");
+	wprintf("</td></tr></table>\n");
 
-	wprintf("<CENTER>\n");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Create new room"));
+	wprintf("<div class=\"buttons\">\n");
+	wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-	wprintf("</CENTER>\n");
-	wprintf("</FORM>\n<hr />");
+	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
+	wprintf("</div>\n");
+	wprintf("</form>\n<hr />");
 	serv_printf("MESG roomaccess");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
-		fmout("CENTER");
+		fmout("LEFT");
 	}
-	wprintf("</td></tr></table></div>\n");
+
+	do_template("endbox");
+
 	wDumpContent(1);
 }
 
 
 
 
-/**
- * \brief support function for entroom() -- sets the default view 
+/*
+ * support function for entroom() -- sets the default view 
  */
 void er_set_default_view(int newview) {
 
@@ -2200,8 +2571,8 @@ void er_set_default_view(int newview) {
 
 
 
-/**
- * \brief enter a new room
+/*
+ * Create a new room
  */
 void entroom(void)
 {
@@ -2213,7 +2584,7 @@ void entroom(void)
 	int er_num_type;
 	int er_view;
 
-	if (strlen(bstr("ok_button")) == 0) {
+	if (!havebstr("ok_button")) {
 		strcpy(WC->ImportantMessage,
 			_("Cancelled.  No new room was created."));
 		display_main_menu();
@@ -2222,8 +2593,8 @@ void entroom(void)
 	strcpy(er_name, bstr("er_name"));
 	strcpy(er_type, bstr("type"));
 	strcpy(er_password, bstr("er_password"));
-	er_floor = atoi(bstr("er_floor"));
-	er_view = atoi(bstr("er_view"));
+	er_floor = ibstr("er_floor");
+	er_view = ibstr("er_view");
 
 	er_num_type = 0;
 	if (!strcmp(er_type, "hidden"))
@@ -2244,6 +2615,10 @@ void entroom(void)
 		display_main_menu();
 		return;
 	}
+	/** TODO: Room created, now udate 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 */
 }
@@ -2254,54 +2629,48 @@ void entroom(void)
  */
 void display_private(char *rname, int req_pass)
 {
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE class=\"roomops_banner\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">");
-	wprintf(_("Go to a hidden room"));
-	wprintf("</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table class=\"roomops_background\"><tr><td>\n");
+	svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Go to a hidden room"));
+	do_template("beginbox");
 
-	wprintf("<CENTER>\n");
-	wprintf("<br />");
+	wprintf("<p>");
 	wprintf(_("If you know the name of a hidden (guess-name) or "
 		"passworded room, you can enter that room by typing "
 		"its name below.  Once you gain access to a private "
 		"room, it will appear in your regular room listings "
 		"so you don't have to keep returning here."));
-	wprintf("\n<br /><br />");
+	wprintf("</p>");
 
-	wprintf("<FORM METHOD=\"POST\" action=\"goto_private\">\n");
+	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"
-		"<TR><TD>");
+	wprintf("<table class=\"altern\"> "
+		"<tr class=\"even\"><td>");
 	wprintf(_("Enter room name:"));
-	wprintf("</TD><TD>"
-		"<INPUT TYPE=\"text\" NAME=\"gr_name\" "
-		"VALUE=\"%s\" MAXLENGTH=\"128\">\n", rname);
+	wprintf("</td><td>"
+		"<input type=\"text\" name=\"gr_name\" "
+		"value=\"%s\" maxlength=\"128\">\n", rname);
 
 	if (req_pass) {
-		wprintf("</TD></TR><TR><TD>");
+		wprintf("</td></tr><tr class=\"odd\"><td>");
 		wprintf(_("Enter room password:"));
-		wprintf("</TD><TD>");
-		wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
+		wprintf("</td><td>");
+		wprintf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
 	}
-	wprintf("</TD></TR></TABLE><br />\n");
+	wprintf("</td></tr></table>\n");
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+	wprintf("<div class=\"buttons\">\n");
+	wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
 		"&nbsp;"
-		"<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
+		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
 		_("Go there"),
 		_("Cancel")
 	);
-	wprintf("</FORM>\n");
-	wprintf("</td></tr></table></div>\n");
+	wprintf("</div></form>\n");
+
+	do_template("endbox");
+
 	wDumpContent(1);
 }
 
@@ -2313,7 +2682,7 @@ void goto_private(void)
 	char hold_rm[SIZ];
 	char buf[SIZ];
 
-	if (strlen(bstr("ok_button")) == 0) {
+	if (!havebstr("ok_button")) {
 		display_main_menu();
 		return;
 	}
@@ -2348,22 +2717,23 @@ void display_zap(void)
 	output_headers(1, 1, 2, 0, 0, 0);
 
 	wprintf("<div id=\"banner\">\n");
-	wprintf("<TABLE class=\"roomops_zap\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">");
+	wprintf("<h1>");
 	wprintf(_("Zap (forget/unsubscribe) the current room"));
-	wprintf("</SPAN>\n");
-	wprintf("</TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
+	wprintf("</h1>\n");
+	wprintf("</div>\n");
+
+	wprintf("<div id=\"content\" class=\"service\">\n");
 
 	wprintf(_("If you select this option, <em>%s</em> will "
 		"disappear from your room list.  Is this what you wish "
 		"to do?<br />\n"), WC->wc_roomname);
 
-	wprintf("<FORM METHOD=\"POST\" action=\"zap\">\n");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
+	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"));
-	wprintf("</FORM>\n");
+	wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+	wprintf("</form>\n");
 	wDumpContent(1);
 }
 
@@ -2382,7 +2752,7 @@ void zap(void)
 	 */
 	strcpy(final_destination, WC->wc_roomname);
 
-	if (strlen(bstr("ok_button")) > 0) {
+	if (havebstr("ok_button")) {
 		serv_printf("GOTO %s", WC->wc_roomname);
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
@@ -2405,8 +2775,10 @@ void delete_room(void)
 {
 	char buf[SIZ];
 
+	
 	serv_puts("KILL 1");
 	serv_getln(buf, sizeof buf);
+	burn_folder_cache(0);	/* Burn the cahce of known rooms to update the icon bar */
 	if (buf[0] != '2') {
 		strcpy(WC->ImportantMessage, &buf[4]);
 		display_main_menu();
@@ -2430,15 +2802,30 @@ void netedit(void) {
 	char cmpb0[SIZ];
 	char cmpb1[SIZ];
 	int i, num_addrs;
-
-	if (strlen(bstr("line"))==0) {
+	// TODO: do line dynamic!
+	if (havebstr("line_pop3host")) {
+		strcpy(line, bstr("prefix"));
+		strcat(line, bstr("line_pop3host"));
+		strcat(line, "|");
+		strcat(line, bstr("line_pop3user"));
+		strcat(line, "|");
+		strcat(line, bstr("line_pop3pass"));
+		strcat(line, "|");
+		strcat(line, ibstr("line_pop3keep") ? "1" : "0" );
+		strcat(line, "|");
+		sprintf(&line[strlen(line)],"%ld", lbstr("line_pop3int"));
+		strcat(line, bstr("suffix"));
+	}
+	else if (havebstr("line")) {
+		strcpy(line, bstr("prefix"));
+		strcat(line, bstr("line"));
+		strcat(line, bstr("suffix"));
+	}
+	else {
 		display_editroom();
 		return;
 	}
 
-	strcpy(line, bstr("prefix"));
-	strcat(line, bstr("line"));
-	strcat(line, bstr("suffix"));
 
 	fp = tmpfile();
 	if (fp == NULL) {
@@ -2480,7 +2867,7 @@ void netedit(void) {
 		serv_puts(buf);
 	}
 
-	if (strlen(bstr("add_button")) > 0) {
+	if (havebstr("add_button")) {
 		num_addrs = num_tokens(bstr("line"), ',');
 		if (num_addrs < 2) {
 			/* just adding one node or address */
@@ -2515,7 +2902,7 @@ void netedit(void) {
  */
 void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 {
-	int i;
+	int i, len;
 
 	/**
 	 * For mailboxes, just do it straight...
@@ -2528,13 +2915,20 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 	 * Otherwise, prefix the floor name as a "public folders" moniker
 	 */
 	else {
-		sprintf(folder, "%s|%s", floorlist[floor], room);
+		if (floor > MAX_FLOORS) {
+			wc_backtrace ();
+			sprintf(folder, "%%%%%%|%s", room);
+		}
+		else {
+			sprintf(folder, "%s|%s", floorlist[floor], room);
+		}
 	}
 
 	/**
 	 * Replace "\" characters with "|" for pseudo-folder-delimiting
 	 */
-	for (i=0; i<strlen(folder); ++i) {
+	len = strlen (folder);
+	for (i=0; i<len; ++i) {
 		if (folder[i] == '\\') folder[i] = '|';
 	}
 }
@@ -2563,7 +2957,7 @@ void do_change_view(int newview) {
 void change_view(void) {
 	int view;
 
-	view = atol(bstr("view"));
+	view = lbstr("view");
 	do_change_view(view);
 }
 
@@ -2609,8 +3003,10 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 
 		has_subfolders = 0;
 		if ((i+1) < max_folders) {
-			if ( (!strncasecmp(fold[i].name, fold[i+1].name, strlen(fold[i].name)))
-			   && (fold[i+1].name[strlen(fold[i].name)] == '|') ) {
+			int len;
+			len = strlen(fold[i].name);
+			if ( (!strncasecmp(fold[i].name, fold[i+1].name, len))
+			   && (fold[i+1].name[len] == '|') ) {
 				has_subfolders = 1;
 			}
 		}
@@ -2627,17 +3023,17 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 		}
 
 		if (levels == 1) {
-			wprintf("<SPAN CLASS=\"roomlist_floor\">");
+			wprintf("<span class=\"roomlist_floor\">");
 		}
 		else if (fold[i].hasnewmsgs) {
-			wprintf("<SPAN CLASS=\"roomlist_new\">");
+			wprintf("<span class=\"roomlist_new\">");
 		}
 		else {
-			wprintf("<SPAN CLASS=\"roomlist_old\">");
+			wprintf("<span class=\"roomlist_old\">");
 		}
 		extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
 		escputs(buf);
-		wprintf("</SPAN>");
+		wprintf("</span>");
 
 		wprintf("</a>', ");
 		if (has_subfolders) {
@@ -2713,7 +3109,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 	if (boxes_per_column < 1) boxes_per_column = 1;
 
 	/** Outer table (for columnization) */
-	wprintf("<TABLE BORDER=0 WIDTH=96%% CELLPADDING=5>"
+	wprintf("<table BORDER=0 WIDTH=96%% CELLPADDING=5>"
 		"<tr><td valign=top>");
 
 	levels = 0;
@@ -2725,9 +3121,10 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 			'|', sizeof floor_name);
 
 		if ( (strcasecmp(floor_name, old_floor_name))
-		   && (strlen(old_floor_name) > 0) ) {
+		   && (!IsEmptyStr(old_floor_name)) ) {
 			/* End inner box */
 			do_template("endbox");
+			wprintf("<br>");
 
 			++num_boxes;
 			if ((num_boxes % boxes_per_column) == 0) {
@@ -2741,8 +3138,8 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
 		if (levels == 1) {
 			/** Begin inner box */
-			stresc(boxtitle, floor_name, 1, 0);
-			svprintf("BOXTITLE", WCS_STRING, boxtitle);
+			stresc(boxtitle, 256, floor_name, 1, 0);
+			svprintf(HKEY("BOXTITLE"), WCS_STRING, boxtitle);
 			do_template("beginbox");
 		}
 
@@ -2760,14 +3157,14 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 				wprintf("<i>");
 			}
 			if (fold[i].hasnewmsgs) {
-				wprintf("<SPAN CLASS=\"roomlist_new\">");
+				wprintf("<span class=\"roomlist_new\">");
 			}
 			else {
-				wprintf("<SPAN CLASS=\"roomlist_old\">");
+				wprintf("<span class=\"roomlist_old\">");
 			}
 			extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
 			escputs(buf);
-			wprintf("</SPAN>");
+			wprintf("</span>");
 			if (fold[i].selectable) {
 				wprintf("</A>");
 			}
@@ -2783,7 +3180,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 	/** End the final inner box */
 	do_template("endbox");
 
-	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</td></tr></table>\n");
 }
 
 /**
@@ -2825,7 +3222,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 			'|', sizeof floor_name);
 
 		if ( (strcasecmp(floor_name, old_floor_name))
-		   && (strlen(old_floor_name) > 0) ) {
+		   && (!IsEmptyStr(old_floor_name)) ) {
 			/** End inner box */
 			wprintf("<br>\n");
 			wprintf("</div>\n");	/** floordiv */
@@ -2834,7 +3231,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
 		if (levels == 1) {
 			/** Begin floor */
-			stresc(floordivtitle, floor_name, 0, 0);
+			stresc(floordivtitle, 256, floor_name, 0, 0);
 			sprintf(floordiv_id, "floordiv%d", i);
 			wprintf("<span class=\"ib_roomlist_floor\" "
 				"onClick=\"expand_floor('%s')\">"
@@ -2879,23 +3276,23 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 				wprintf("<a href=\"dotgoto?room=");
 				urlescputs(fold[i].room);
 				wprintf("\">");
-				wprintf("<img align=\"middle\" border=0 src=\"static/%s\" alt=\"\"> ", icon);
+				wprintf("<img  border=0 src=\"static/%s\" alt=\"\"> ", icon);
 			}
 			else {
 				wprintf("<i>");
 			}
 			if (fold[i].hasnewmsgs) {
-				wprintf("<SPAN CLASS=\"ib_roomlist_new\">");
+				wprintf("<span class=\"ib_roomlist_new\">");
 			}
 			else {
-				wprintf("<SPAN CLASS=\"ib_roomlist_old\">");
+				wprintf("<span class=\"ib_roomlist_old\">");
 			}
 			extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
 			escputs(buf);
 			if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
 				wprintf(" (INBOX)");
 			}
-			wprintf("</SPAN>");
+			wprintf("</span>");
 			if (fold[i].selectable) {
 				wprintf("</A>");
 			}
@@ -2926,7 +3323,8 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 	}
 
 	wprintf("num_drop_targets = %d;\n", num_drop_targets);
-	if (strlen(WC->floordiv_expanded) > 1) {
+	if ((WC->floordiv_expanded[0] != '\0')&&
+	    (WC->floordiv_expanded[1] != '\0')){
 		wprintf("which_div_expanded = '%s';\n", WC->floordiv_expanded);
 	}
 
@@ -2936,6 +3334,25 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
 
 
+/**
+ * \brief Burn the cached folder list.  
+ * \param age How old the cahce needs to be before we burn it.
+ */
+
+void burn_folder_cache(time_t age)
+{
+	/** If our cached folder list is very old, burn it. */
+	if (WC->cache_fold != NULL) {
+		if ((time(NULL) - WC->cache_timestamp) > age) {
+			free(WC->cache_fold);
+			WC->cache_fold = NULL;
+		}
+	}
+}
+
+
+
+
 /**
  * \brief Show the room list.  
  * (only should get called by
@@ -2950,19 +3367,18 @@ void list_all_rooms_by_floor(char *viewpref) {
 	struct folder ftmp;
 	int max_folders = 0;
 	int alloc_folders = 0;
+	int *floor_mapping;
+	int IDMax;
 	int i, j;
 	int ra_flags = 0;
 	int flags = 0;
 	int num_floors = 1;	/** add an extra one for private folders */
-
+	char buf2[SIZ];
+	char buf3[SIZ];
+	
 	/** If our cached folder list is very old, burn it. */
-	if (WC->cache_fold != NULL) {
-		if ((time(NULL) - WC->cache_timestamp) > 300) {
-			free(WC->cache_fold);
-			WC->cache_fold = NULL;
-		}
-	}
-
+	burn_folder_cache(300);
+	
 	/** Can we do the iconbar roomlist from cache? */
 	if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
 		do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
@@ -2991,10 +3407,20 @@ void list_all_rooms_by_floor(char *viewpref) {
 		}
 		memset(&fold[max_folders], 0, sizeof(struct folder));
 		extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
+		extract_token(buf3, buf, 0, '|', SIZ);
+		fold[max_folders].floor = atol (buf3);
 		++max_folders;
 		++num_floors;
 	}
-
+	IDMax = 0;
+	for (i=0; i<num_floors; i++)
+		if (IDMax < fold[i].floor)
+			IDMax = fold[i].floor;
+	floor_mapping = malloc (sizeof (int) * (IDMax + 1));
+	memset (floor_mapping, 0, sizeof (int) * (IDMax + 1));
+	for (i=0; i<num_floors; i++)
+		floor_mapping[fold[i].floor]=i;
+	
 	/** refresh the messages index for this room */
 //	serv_puts("GOTO ");
 //	while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
@@ -3023,9 +3449,36 @@ void list_all_rooms_by_floor(char *viewpref) {
 				fold[max_folders].floor,
 				fold[max_folders].is_mailbox);
 		fold[max_folders].selectable = 1;
+		/* Increase the room count for the associtaed floor */
+		if (fold[max_folders].is_mailbox) {
+			fold[0].num_rooms++;
+		}
+		else {
+			i = floor_mapping[fold[max_folders].floor];
+			fold[i].num_rooms++;
+		}
 		++max_folders;
 	}
-
+	
+	/*
+	 * Remove any floors that don't have rooms
+	 */
+	get_preference("emptyfloors", buf2, sizeof buf2);
+	if (buf2[0]==0 || (strcasecmp(buf2, "no") == 0))
+	{
+		for (i=0; i<num_floors; i++)
+		{
+        		if (fold[i].num_rooms == 0) {
+                		for (j=i; j<max_folders; j++) {
+                        		memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
+                		}
+                		max_folders--;
+                		num_floors--;
+                		i--;
+        		}
+		}
+	}
+	
 	/** Bubble-sort the folder list */
 	for (i=0; i<max_folders; ++i) {
 		for (j=0; j<(max_folders-1)-i; ++j) {
@@ -3076,6 +3529,7 @@ void list_all_rooms_by_floor(char *viewpref) {
 	WC->cache_max_folders = max_folders;
 	WC->cache_num_floors = num_floors;
 	WC->cache_timestamp = time(NULL);
+	free(floor_mapping);
 }
 
 
@@ -3091,7 +3545,7 @@ void knrooms(void)
 
 	/** Determine whether the user is trying to change views */
 	if (bstr("view") != NULL) {
-		if (strlen(bstr("view")) > 0) {
+		if (havebstr("view")) {
 			set_preference("roomlistview", bstr("view"), 1);
 		}
 	}
@@ -3104,10 +3558,9 @@ void knrooms(void)
 	}
 
 	/** title bar */
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE class=\"roomops_banner\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">"
-	);
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<div class=\"room_banner\">");
+	wprintf("<h1>");
 	if (!strcasecmp(listviewpref, "rooms")) {
 		wprintf(_("Room list"));
 	}
@@ -3117,32 +3570,35 @@ void knrooms(void)
 	if (!strcasecmp(listviewpref, "table")) {
 		wprintf(_("Room list"));
 	}
-	wprintf("</SPAN></TD>\n");
+	wprintf("</h1></div>\n");
 
 	/** offer the ability to switch views */
-	wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
-		"<SELECT NAME=\"newview\" SIZE=\"1\" "
+	wprintf("<ul class=\"room_actions\">\n");
+	wprintf("<li class=\"start_page\">");
+	offer_start_page();
+	wprintf("</li>");
+	wprintf("<li><form name=\"roomlistomatic\">\n"
+		"<select name=\"newview\" size=\"1\" "
 		"OnChange=\"location.href=roomlistomatic.newview.options"
 		"[selectedIndex].value\">\n");
 
-	wprintf("<OPTION %s VALUE=\"knrooms&view=rooms\">"
+	wprintf("<option %s value=\"knrooms&view=rooms\">"
 		"View as room list"
-		"</OPTION>\n",
+		"</option>\n",
 		( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
 	);
 
-	wprintf("<OPTION %s VALUE=\"knrooms&view=folders\">"
+	wprintf("<option %s value=\"knrooms&view=folders\">"
 		"View as folder list"
-		"</OPTION>\n",
+		"</option>\n",
 		( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
 	);
 
-	wprintf("</SELECT><br />");
-	offer_start_page();
-	wprintf("</FORM></TD></TR></TABLE>\n");
-	wprintf("</div>\n"
-		"</div>\n"
-		"<div id=\"content\">\n");
+	wprintf("</select>");
+	wprintf("</form></li>");
+	wprintf("</ul></div>\n");
+
+	wprintf("<div id=\"content\" class=\"service\">\n");
 
 	/** Display the room list in the user's preferred format */
 	list_all_rooms_by_floor(listviewpref);
@@ -3157,20 +3613,20 @@ void knrooms(void)
 void set_room_policy(void) {
 	char buf[SIZ];
 
-	if (strlen(bstr("ok_button")) == 0) {
+	if (!havebstr("ok_button")) {
 		strcpy(WC->ImportantMessage,
 			_("Cancelled.  Changes were not saved."));
 		display_editroom();
 		return;
 	}
 
-	serv_printf("SPEX room|%d|%d", atoi(bstr("roompolicy")), atoi(bstr("roomvalue")));
+	serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
 	serv_getln(buf, sizeof buf);
 	strcpy(WC->ImportantMessage, &buf[4]);
 
 	if (WC->axlevel >= 6) {
 		strcat(WC->ImportantMessage, "<br />\n");
-		serv_printf("SPEX floor|%d|%d", atoi(bstr("floorpolicy")), atoi(bstr("floorvalue")));
+		serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), bstr("floorvalue"));
 		serv_getln(buf, sizeof buf);
 		strcat(WC->ImportantMessage, &buf[4]);
 	}