X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomops.c;h=5ed5c5a3e67709ff7441413bef49a45f02d26e8a;hb=d120028b4c45f3c26d05186c8ba488fd2feef13f;hp=dc0dd876a687612f2d3ed030582993451ea5b3f8;hpb=430f92bb28a5a9b501525ebdbf5d2b3ea3e909cc;p=citadel.git

diff --git a/webcit/roomops.c b/webcit/roomops.c
index dc0dd876a..5ed5c5a3e 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -6,26 +6,19 @@
 
 #include "webcit.h"
 
-struct folder {
-	int floor;
-	char room[SIZ];
-	char name[SIZ];
-	int hasnewmsgs;
-	int is_mailbox;
-	int selectable;
-	int view;
-};
+char floorlist[128][SIZ];
 
-char *viewdefs[] = {
-	"Bulletin Board",
-	"Mail Folder",
-	"Address Book",
-	"Calendar",
-	"Task List",
-	"Notes List"
-};
+char *viewdefs[6];
+
+void initialize_viewdefs(void) {
+	viewdefs[0] = _("Bulletin Board");
+	viewdefs[1] = _("Mail Folder");
+	viewdefs[2] = _("Address Book");
+	viewdefs[3] = _("Calendar");
+	viewdefs[4] = _("Task List");
+	viewdefs[5] = _("Notes List");
+}
 
-char floorlist[128][SIZ];
 
 /*
  * load the list of floors
@@ -96,7 +89,7 @@ void room_tree_list(struct roomlisting *rp)
 	strcpy(rmname, rp->rlname);
 	f = rp->rlflags;
 
-	wprintf("<A HREF=\"/dotgoto&room=");
+	wprintf("<a href=\"dotgoto&room=");
 	urlescputs(rmname);
 	wprintf("\"");
 	wprintf(">");
@@ -232,6 +225,9 @@ void readinfo(void)
 	if (buf[0] == '1') {
 		fmout("CENTER");
 	}
+	else {
+		wprintf("&nbsp;");
+	}
 }
 
 
@@ -248,7 +244,7 @@ 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=64 src=\"image&name=_roompic_&room=");
 		urlescputs(WC->wc_roomname);
 		wprintf("\">");
 		serv_puts("CLOS");
@@ -301,8 +297,10 @@ void embed_room_graphic(void) {
 void embed_view_o_matic(void) {
 	int i;
 
-	wprintf("<form name=\"viewomatic\" action=\"/changeview\">\n"
-		"<span class=\"room_banner_new_messages\">View as: "
+	wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
+		"<span class=\"room_banner_new_messages\">");
+	wprintf(_("View as:"));
+	wprintf(" "
 		"<SELECT NAME=\"newview\" SIZE=\"1\" "
 		"STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
 		" font-size: 7pt; background: #444455; color: #ddddcc;\" "
@@ -322,7 +320,7 @@ void embed_view_o_matic(void) {
 		   ||	( (i == 1) && (WC->wc_default_view == 0) )
 		) {
 
-			wprintf("<OPTION %s VALUE=\"/changeview?view=%d\">",
+			wprintf("<OPTION %s VALUE=\"changeview?view=%d\">",
 				((i == WC->wc_view) ? "SELECTED" : ""),
 				i );
 			escputs(viewdefs[i]);
@@ -346,11 +344,18 @@ void embed_room_banner(char *got, int navbar_style) {
 		got = fakegot;
 	}
 
+	/* The browser needs some information for its own use */
+	wprintf("<script type=\"text/javascript\">	\n"
+		"	room_is_trash = %d;		\n"
+		"</script>\n",
+		WC->wc_is_trash
+	);
+
 	/* If the user happens to select the "make this my start page" link,
 	 * we want it to remember the URL as a "/dotskip" one instead of
 	 * a "skip" or "gotonext" or something like that.
 	 */
-	snprintf(WC->this_page, sizeof(WC->this_page), "/dotskip&room=%s",
+	snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
 		WC->wc_roomname);
 
 	/* Check for new mail. */
@@ -358,8 +363,11 @@ void embed_room_banner(char *got, int navbar_style) {
 	WC->wc_view = extract_int(&got[4], 11);
 
 	svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
-	svprintf("NEWMSGS", WCS_STRING, "%d", extract_int(&got[4], 1));
-	svprintf("TOTALMSGS", WCS_STRING, "%d", extract_int(&got[4], 2));
+	svprintf("NUMMSGS", WCS_STRING,
+		_("%d new of %d messages"),
+		extract_int(&got[4], 1),
+		extract_int(&got[4], 2)
+	);
 	svcallback("ROOMPIC", embed_room_graphic);
 	svcallback("ROOMINFO", readinfo);
 	svcallback("VIEWOMATIC", embed_view_o_matic);
@@ -374,8 +382,8 @@ void embed_room_banner(char *got, int navbar_style) {
 
 		if (navbar_style == navbar_default) wprintf(
 			"<td>"
-			"<a href=\"/ungoto\">"
-			"<img align=\"middle\" src=\"/static/ungoto2_24x.gif\" border=\"0\">"
+			"<a href=\"ungoto\">"
+			"<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
 			"<span class=\"navbar_link\">%s</span></A>"
 			"</td>\n", _("Ungoto")
 		);
@@ -383,8 +391,8 @@ void embed_room_banner(char *got, int navbar_style) {
 		if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
 			wprintf(
 				"<td>"
-				"<A HREF=\"/readnew\">"
-				"<img align=\"middle\" src=\"/static/newmess2_24x.gif\" border=\"0\">"
+				"<a href=\"readnew\">"
+				"<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
 				"<span class=\"navbar_link\">%s</span></A>"
 				"</td>\n", _("Read new messages")
 			);
@@ -395,8 +403,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_ADDRESSBOOK:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd\">"
-						"<img align=\"middle\" src=\"/static/viewcontacts_24x.gif\" "
+						"<a href=\"readfwd\">"
+						"<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -406,8 +414,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_CALENDAR:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd?calview=day\">"
-						"<img align=\"middle\" src=\"/static/taskday2_24x.gif\" "
+						"<a href=\"readfwd?calview=day\">"
+						"<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -415,8 +423,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					);
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd?calview=month\">"
-						"<img align=\"middle\" src=\"/static/monthview2_24x.gif\" "
+						"<a href=\"readfwd?calview=month\">"
+						"<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -426,8 +434,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_TASKS:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd\">"
-						"<img align=\"middle\" src=\"/static/taskmanag_24x.gif\" "
+						"<a href=\"readfwd\">"
+						"<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -437,8 +445,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_NOTES:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd\">"
-						"<img align=\"middle\" src=\"/static/viewnotes_24x.gif\" "
+						"<a href=\"readfwd\">"
+						"<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -448,8 +456,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				case VIEW_MAILBOX:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd\">"
-						"<img align=\"middle\" src=\"/static/readallmess3_24x.gif\" "
+						"<a href=\"readfwd\">"
+						"<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -459,8 +467,8 @@ void embed_room_banner(char *got, int navbar_style) {
 				default:
 					wprintf(
 						"<td>"
-						"<A HREF=\"/readfwd\">"
-						"<img align=\"middle\" src=\"/static/readallmess3_24x.gif\" "
+						"<a href=\"readfwd\">"
+						"<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
 						"border=\"0\">"
 						"<span class=\"navbar_link\">"
 						"%s"
@@ -474,8 +482,8 @@ void embed_room_banner(char *got, int navbar_style) {
 			switch(WC->wc_view) {
 				case VIEW_ADDRESSBOOK:
 					wprintf(
-						"<td><A HREF=\"/display_enter\">"
-						"<img align=\"middle\" src=\"/static/addnewcontact_24x.gif\" "
+						"<td><a href=\"display_enter\">"
+						"<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
 						"border=\"0\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></td>\n", _("Add new contact")
@@ -483,8 +491,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					break;
 				case VIEW_CALENDAR:
 					wprintf(
-						"<td><A HREF=\"/display_enter\">"
-						"<img align=\"middle\" src=\"/static/addevent_24x.gif\" "
+						"<td><a href=\"display_enter\">"
+						"<img align=\"middle\" src=\"static/addevent_24x.gif\" "
 						"border=\"0\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></td>\n", _("Add new event")
@@ -492,8 +500,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					break;
 				case VIEW_TASKS:
 					wprintf(
-						"<td><A HREF=\"/display_enter\">"
-						"<img align=\"middle\" src=\"/static/newmess3_24x.gif\" "
+						"<td><a href=\"display_enter\">"
+						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
 						"border=\"0\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></td>\n", _("Add new task")
@@ -501,8 +509,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					break;
 				case VIEW_NOTES:
 					wprintf(
-						"<td><A HREF=\"/display_enter\">"
-						"<img align=\"middle\" src=\"/static/enternewnote_24x.gif\" "
+						"<td><a href=\"display_enter\">"
+						"<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
 						"border=\"0\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></td>\n", _("Add new note")
@@ -510,8 +518,8 @@ void embed_room_banner(char *got, int navbar_style) {
 					break;
 				default:
 					wprintf(
-						"<td><A HREF=\"/display_enter\">"
-						"<img align=\"middle\" src=\"/static/newmess3_24x.gif\" "
+						"<td><a href=\"display_enter\">"
+						"<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
 						"border=\"0\"><span class=\"navbar_link\">"
 						"%s"
 						"</span></a></td>\n", _("Enter a message")
@@ -522,9 +530,9 @@ void embed_room_banner(char *got, int navbar_style) {
 
 		if (navbar_style == navbar_default) wprintf(
 			"<td>"
-			"<A HREF=\"/skip\" "
+			"<a href=\"skip\" "
 			"TITLE=\"%s\">"
-			"<img align=\"middle\" src=\"/static/skipthisroom_24x.gif\" border=\"0\">"
+			"<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
 			"<span class=\"navbar_link\">%s</span></a>"
 			"</td>\n",
 			_("Leave all messages marked as unread, go to next room with unread messages"),
@@ -533,9 +541,9 @@ void embed_room_banner(char *got, int navbar_style) {
 
 		if (navbar_style == navbar_default) wprintf(
 			"<td>"
-			"<A HREF=\"/gotonext\" "
+			"<a href=\"gotonext\" "
 			"TITLE=\"%s\">"
-			"<img align=\"middle\" src=\"/static/markngo_24x.gif\" border=\"0\">"
+			"<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
 			"<span class=\"navbar_link\">%s</span></a>"
 			"</td>\n",
 			_("Mark all messages as read, go to next room with unread messages"),
@@ -589,6 +597,7 @@ int gotoroom(char *gname)
 	WC->wc_floor = extract_int(&buf[4], 10);
 	WC->wc_view = extract_int(&buf[4], 11);
 	WC->wc_default_view = extract_int(&buf[4], 12);
+	WC->wc_is_trash = extract_int(&buf[4], 13);
 
 	if (WC->is_aide)
 		WC->is_room_aide = WC->is_aide;
@@ -872,7 +881,7 @@ void display_editroom(void)
 
 	/* print the tabbed dialog */
 	wprintf("<br />"
-		"<div id=\"fix_scrollbar_bug\">"
+		"<div class=\"fix_scrollbar_bug\">"
 		"<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
 		"<TR ALIGN=CENTER>"
 		"<TD>&nbsp;</TD>\n");
@@ -881,7 +890,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=admin\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=admin\">");
 	}
 	wprintf(_("Administration"));
 	if (!strcmp(tab, "admin")) {
@@ -897,7 +906,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=config\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=config\">");
 	}
 	wprintf(_("Configuration"));
 	if (!strcmp(tab, "config")) {
@@ -913,7 +922,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=expire\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=expire\">");
 	}
 	wprintf(_("Message expire policy"));
 	if (!strcmp(tab, "expire")) {
@@ -929,7 +938,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=access\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=access\">");
 	}
 	wprintf(_("Access controls"));
 	if (!strcmp(tab, "access")) {
@@ -945,7 +954,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=sharing\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=sharing\">");
 	}
 	wprintf(_("Sharing"));
 	if (!strcmp(tab, "sharing")) {
@@ -961,7 +970,7 @@ void display_editroom(void)
 		wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
 	}
 	else {
-		wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=listserv\">");
+		wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=listserv\">");
 	}
 	wprintf(_("Mailing list service"));
 	if (!strcmp(tab, "listserv")) {
@@ -977,29 +986,29 @@ void display_editroom(void)
 	/* end tabbed dialog */	
 
 	/* begin content of whatever tab is open now */
-	wprintf("<div id=\"fix_scrollbar_bug\">"
+	wprintf("<div class=\"fix_scrollbar_bug\">"
 		"<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
 		"<TR><TD>\n");
 
 	if (!strcmp(tab, "admin")) {
 		wprintf("<UL>"
-			"<LI><A HREF=\"/delete_room\" "
+			"<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");
+			"<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");
+			"<LI><a href=\"display_editinfo\">\n");
 		wprintf(_("Edit this room's Info file"));
 		wprintf("</A>\n"
 			"</UL>");
 	}
 
 	if (!strcmp(tab, "config")) {
-		wprintf("<FORM METHOD=\"POST\" ACTION=\"/editroom\">\n");
+		wprintf("<FORM METHOD=\"POST\" action=\"editroom\">\n");
 	
 		wprintf("<UL><LI>");
 		wprintf(_("Name of room: "));
@@ -1242,7 +1251,7 @@ void display_editroom(void)
 			extract_token(remote_room, buf, 1, '|', sizeof remote_room);
 			if (strlen(node) > 0) {
 				wprintf("<FORM METHOD=\"POST\" "
-					"ACTION=\"/netedit\">"
+					"action=\"netedit\">"
 					"<TR><TD>%s</TD>\n", node);
 
 				wprintf("<TD>");
@@ -1285,7 +1294,7 @@ void display_editroom(void)
 			extract_token(node, not_shared_with, i, '\n', sizeof node);
 			if (strlen(node) > 0) {
 				wprintf("<FORM METHOD=\"POST\" "
-					"ACTION=\"/netedit\">"
+					"action=\"netedit\">"
 					"<TR><TD>");
 				escputs(node);
 				wprintf("</TD><TD>"
@@ -1346,7 +1355,7 @@ void display_editroom(void)
 				extract_token(recp, buf, 1, '|', sizeof recp);
 			
 				escputs(recp);
-				wprintf(" <A HREF=\"/netedit&cmd=remove&line="
+				wprintf(" <a href=\"netedit&cmd=remove&line="
 					"listrecp|");
 				urlescputs(recp);
 				wprintf("&tab=listserv\">");
@@ -1354,7 +1363,7 @@ void display_editroom(void)
 				wprintf("</A><br />");
 			}
 		}
-		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\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=\"text\" NAME=\"line\">\n");
@@ -1376,7 +1385,7 @@ void display_editroom(void)
 				extract_token(recp, buf, 1, '|', sizeof recp);
 			
 				escputs(recp);
-				wprintf(" <A HREF=\"/netedit&cmd=remove&line="
+				wprintf(" <a href=\"netedit&cmd=remove&line="
 					"digestrecp|");
 				urlescputs(recp);
 				wprintf("&tab=listserv\">");
@@ -1384,7 +1393,7 @@ void display_editroom(void)
 				wprintf("</A><br />");
 			}
 		}
-		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\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=\"text\" NAME=\"line\">\n");
@@ -1396,7 +1405,7 @@ void display_editroom(void)
 		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("<a href=\"toggle_self_service?newval=0&tab=listserv\">");
 			wprintf(_("Click to disable."));
 			wprintf("</A><br />\n");
 			wprintf(_("The URL for subscribe/unsubscribe is: "));
@@ -1407,7 +1416,7 @@ void display_editroom(void)
 		else {
 			wprintf(_("This room is <i>not</i> configured to allow "
 				"self-service subscribe/unsubscribe requests."));
-			wprintf(" <A HREF=\"/toggle_self_service?newval=1&"
+			wprintf(" <a href=\"toggle_self_service?newval=1&"
 				"tab=listserv\">");
 			wprintf(_("Click to enable."));
 			wprintf("</A><br />\n");
@@ -1435,7 +1444,7 @@ void display_editroom(void)
 			floorvalue = extract_int(&buf[4], 1);
 		}
 		
-		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/set_room_policy\">\n");
+		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"));
@@ -1452,7 +1461,8 @@ void display_editroom(void)
 		wprintf("<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
 			((roompolicy == 2) ? "CHECKED" : "") );
-		wprintf("Expire by message count<br />\n");
+		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"));
@@ -1763,7 +1773,7 @@ void display_whok(void)
 		"name from the list and click 'Kick'."));
 	wprintf("<br /><br />");
 	
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/do_invt_kick\">\n");
+        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");
         serv_puts("WHOK");
@@ -1786,9 +1796,10 @@ void display_whok(void)
 		"user name in the box below and click 'Invite'."));
 	wprintf("<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/do_invt_kick\">\n");
+        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-        wprintf("Invite: ");
+        wprintf(_("Invite:"));
+	wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
         	"<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
         	"<input type=\"submit\" value=\"%s\">"
@@ -1827,10 +1838,10 @@ void display_entroom(void)
 		"</div>\n<div id=\"content\">\n"
 	);
 
-	wprintf("<div id=\"fix_scrollbar_bug\">"
+	wprintf("<div class=\"fix_scrollbar_bug\">"
 		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
-	wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"/entroom\">\n");
+	wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
 
 	wprintf("<UL><LI>");
 	wprintf(_("Name of room: "));
@@ -2036,7 +2047,7 @@ void display_private(char *rname, int req_pass)
 		"</div>\n<div id=\"content\">\n"
 	);
 
-	wprintf("<div id=\"fix_scrollbar_bug\">"
+	wprintf("<div class=\"fix_scrollbar_bug\">"
 		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
 	wprintf("<CENTER>\n");
@@ -2048,7 +2059,7 @@ void display_private(char *rname, int req_pass)
 		"so you don't have to keep returning here."));
 	wprintf("\n<br /><br />");
 
-	wprintf("<FORM METHOD=\"POST\" ACTION=\"/goto_private\">\n");
+	wprintf("<FORM METHOD=\"POST\" action=\"goto_private\">\n");
 
 	wprintf("<table border=\"0\" cellspacing=\"5\" "
 		"cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
@@ -2131,7 +2142,7 @@ void display_zap(void)
 		"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("<FORM METHOD=\"POST\" action=\"zap\">\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
 	wprintf("&nbsp;");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
@@ -2368,7 +2379,7 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 		wprintf("var node%d = new TreeNode(%d, '", i, i);
 
 		if (fold[i].selectable) {
-			wprintf("<A HREF=\"/dotgoto?room=");
+			wprintf("<a href=\"dotgoto?room=");
 			urlescputs(fold[i].room);
 			wprintf("\">");
 		}
@@ -2433,8 +2444,10 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
  * Boxes and rooms and lists ... oh my!
  */
 void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
-	char buf[SIZ];
-	char boxtitle[SIZ];
+	char buf[256];
+	char floor_name[256];
+	char old_floor_name[256];
+	char boxtitle[256];
 	int levels, oldlevels;
 	int i, t;
 	int num_boxes = 0;
@@ -2443,6 +2456,9 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 	int current_column = 0;
 	int nf;
 
+	strcpy(floor_name, "");
+	strcpy(old_floor_name, "");
+
 	nf = num_floors;
 	while (nf % columns != 0) ++nf;
 	boxes_per_column = (nf / columns);
@@ -2457,9 +2473,11 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 	for (i=0; i<max_folders; ++i) {
 
 		levels = num_tokens(fold[i].name, '|');
+		extract_token(floor_name, fold[i].name, 0,
+			'|', sizeof floor_name);
 
-		if ((levels == 1) && (oldlevels > 1)) {
-
+		if ( (strcasecmp(floor_name, old_floor_name))
+		   && (strlen(old_floor_name) > 0) ) {
 			/* End inner box */
 			do_template("endbox");
 
@@ -2471,15 +2489,13 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 				}
 			}
 		}
+		strcpy(old_floor_name, floor_name);
 
 		if (levels == 1) {
-
 			/* Begin inner box */
-			extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-			stresc(boxtitle, buf, 1, 0);
+			stresc(boxtitle, floor_name, 1, 0);
 			svprintf("BOXTITLE", WCS_STRING, boxtitle);
 			do_template("beginbox");
-
 		}
 
 		oldlevels = levels;
@@ -2488,7 +2504,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 			wprintf("&nbsp;");
 			if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;&nbsp;&nbsp;");
 			if (fold[i].selectable) {
-				wprintf("<A HREF=\"/dotgoto?room=");
+				wprintf("<a href=\"dotgoto?room=");
 				urlescputs(fold[i].room);
 				wprintf("\">");
 			}
@@ -2523,6 +2539,146 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 }
 
 
+void set_floordiv_expanded(char *which_floordiv) {
+	begin_ajax_response();
+	safestrncpy(WC->floordiv_expanded, which_floordiv, sizeof WC->floordiv_expanded);
+	end_ajax_response();
+}
+
+/*
+ *
+ */
+void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
+	char buf[256];
+	char floor_name[256];
+	char old_floor_name[256];
+	char floordivtitle[256];
+	char floordiv_id[32];
+	int levels, oldlevels;
+	int i, t;
+	int num_drop_targets = 0;
+	char *icon = NULL;
+
+	strcpy(floor_name, "");
+	strcpy(old_floor_name, "");
+
+	levels = 0;
+	oldlevels = 0;
+	for (i=0; i<max_folders; ++i) {
+
+		levels = num_tokens(fold[i].name, '|');
+		extract_token(floor_name, fold[i].name, 0,
+			'|', sizeof floor_name);
+
+		if ( (strcasecmp(floor_name, old_floor_name))
+		   && (strlen(old_floor_name) > 0) ) {
+			/* End inner box */
+			wprintf("<br>\n");
+			wprintf("</div>\n");	/* floordiv */
+		}
+		strcpy(old_floor_name, floor_name);
+
+		if (levels == 1) {
+			/* Begin floor */
+			stresc(floordivtitle, floor_name, 0, 0);
+			sprintf(floordiv_id, "floordiv%d", i);
+			wprintf("<span class=\"ib_roomlist_floor\" "
+				"onClick=\"expand_floor('%s')\">"
+				"%s</span><br>\n", floordiv_id, floordivtitle);
+			wprintf("<div id=\"%s\" style=\"display:%s\">",
+				floordiv_id,
+				(!strcasecmp(floordiv_id, WC->floordiv_expanded) ? "block" : "none")
+			);
+		}
+
+		oldlevels = levels;
+
+		if (levels > 1) {
+			wprintf("<div id=\"roomdiv%d\">", i);
+			wprintf("&nbsp;");
+			if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;");
+
+			/* choose the icon */
+			if (fold[i].view == VIEW_ADDRESSBOOK) {
+				icon = "viewcontacts_16x.gif" ;
+			}
+			else if (fold[i].view == VIEW_CALENDAR) {
+				icon = "calarea_16x.gif" ;
+			}
+			else if (fold[i].view == VIEW_TASKS) {
+				icon = "taskmanag_16x.gif" ;
+			}
+			else if (fold[i].view == VIEW_NOTES) {
+				icon = "storenotes_16x.gif" ;
+			}
+			else if (fold[i].view == VIEW_MAILBOX) {
+				icon = "privatemess_16x.gif" ;
+			}
+			else {
+				icon = "chatrooms_16x.gif" ;
+			}
+
+			if (fold[i].selectable) {
+				wprintf("<a href=\"dotgoto?room=");
+				urlescputs(fold[i].room);
+				wprintf("\">");
+				wprintf("<img align=\"middle\" border=0 src=\"static/%s\" alt=\"\"> ", icon);
+			}
+			else {
+				wprintf("<i>");
+			}
+			if (fold[i].hasnewmsgs) {
+				wprintf("<SPAN CLASS=\"ib_roomlist_new\">");
+			}
+			else {
+				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>");
+			if (fold[i].selectable) {
+				wprintf("</A>");
+			}
+			else {
+				wprintf("</i>");
+			}
+			wprintf("<br />");
+			wprintf("</div>\n");	/* roomdiv */
+		}
+	}
+	wprintf("</div>\n");	/* floordiv */
+
+
+	/* BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
+	wprintf("<img src=\"static/blank.gif\" onLoad=\"\n");
+
+	num_drop_targets = 0;
+
+	for (i=0; i<max_folders; ++i) {
+		levels = num_tokens(fold[i].name, '|');
+		if (levels > 1) {
+			wprintf("drop_targets_elements[%d]=$('roomdiv%d');\n", num_drop_targets, i);
+			wprintf("drop_targets_roomnames[%d]='", num_drop_targets);
+			jsescputs(fold[i].room);
+			wprintf("';\n");
+			++num_drop_targets;
+		}
+	}
+
+	wprintf("num_drop_targets = %d;\n", num_drop_targets);
+	if (strlen(WC->floordiv_expanded) > 1) {
+		wprintf("which_div_expanded = '%s';\n", WC->floordiv_expanded);
+	}
+
+	wprintf("\">\n");
+	/* END: The old invisible pixel trick, to get our JavaScript to initialize */
+}
+
+
+
 /*
  * Show the room list.  (only should get called by
  * knrooms() because that's where output_headers() is called from)
@@ -2540,6 +2696,23 @@ void list_all_rooms_by_floor(char *viewpref) {
 	int flags = 0;
 	int num_floors = 1;	/* add an extra one for private folders */
 
+	/* 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;
+		}
+	}
+
+	/* 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);
+		return;
+	}
+
+	/* Grab the floor table so we know how to build the list... */
+	load_floorlist();
+
 	/* Start with the mailboxes */
 	max_folders = 1;
 	alloc_folders = 1;
@@ -2616,23 +2789,31 @@ void list_all_rooms_by_floor(char *viewpref) {
 		}
 	}
 
-/* test only hackish view 
-	wprintf("<table><TR><TD>A Table</TD></TR></table>\n");
-	for (i=0; i<max_folders; ++i) {
-		escputs(fold[i].name);
-		wprintf("<br />\n");
-	}
- */
 
 	if (!strcasecmp(viewpref, "folders")) {
 		do_folder_view(fold, max_folders, num_floors);
 	}
+	else if (!strcasecmp(viewpref, "hackish_view")) {
+		for (i=0; i<max_folders; ++i) {
+			escputs(fold[i].name);
+			wprintf("<br />\n");
+		}
+	}
+	else if (!strcasecmp(viewpref, "iconbar")) {
+		do_iconbar_view(fold, max_folders, num_floors);
+	}
 	else {
 		do_rooms_view(fold, max_folders, num_floors);
 	}
 
-	free(fold);
-	wDumpContent(1);
+	/* Don't free the folder list ... cache it for future use! */
+	if (WC->cache_fold != NULL) {
+		free(WC->cache_fold);
+	}
+	WC->cache_fold = fold;
+	WC->cache_max_folders = max_folders;
+	WC->cache_num_floors = num_floors;
+	WC->cache_timestamp = time(NULL);
 }
 
 
@@ -2643,7 +2824,6 @@ void knrooms() {
 	char listviewpref[SIZ];
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	load_floorlist();
 
 	/* Determine whether the user is trying to change views */
 	if (bstr("view") != NULL) {
@@ -2665,13 +2845,13 @@ void knrooms() {
 		"<SPAN CLASS=\"titlebar\">"
 	);
 	if (!strcasecmp(listviewpref, "rooms")) {
-		wprintf("Room list");
+		wprintf(_("Room list"));
 	}
 	if (!strcasecmp(listviewpref, "folders")) {
-		wprintf("Folder list");
+		wprintf(_("Folder list"));
 	}
 	if (!strcasecmp(listviewpref, "table")) {
-		wprintf("Room list");
+		wprintf(_("Room list"));
 	}
 	wprintf("</SPAN></TD>\n");
 
@@ -2681,13 +2861,13 @@ void knrooms() {
 		"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",
 		( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
 	);
 
-	wprintf("<OPTION %s VALUE=\"/knrooms&view=folders\">"
+	wprintf("<OPTION %s VALUE=\"knrooms&view=folders\">"
 		"View as folder list"
 		"</OPTION>\n",
 		( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
@@ -2702,6 +2882,7 @@ void knrooms() {
 
 	/* Display the room list in the user's preferred format */
 	list_all_rooms_by_floor(listviewpref);
+	wDumpContent(1);
 }