* Only offer views which make sense for the default view of a room

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 65f01807129ee7668b20191ddd54f35fe03c7039..068ab233a9d06bcc21a168681601877826a3c07a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -348,11 +348,24 @@ void embed_view_o_matic(void) {
                "[selectedIndex].value\">\n");
 
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               wprintf("<OPTION %s VALUE=\"/changeview?view=%d\">",
-                       ((i == WC->wc_view) ? "SELECTED" : ""),
-                       i );
-               escputs(viewdefs[i]);
-               wprintf("</OPTION>\n");
+               /*
+                * Only offer the views that make sense, given the default
+                * view for the room.  For example, don't offer a Calendar
+                * view in a non-Calendar room.
+                */
+               if (
+                       (i == WC->wc_view)
+                  ||   (i == WC->wc_default_view)
+                  ||   ( (i == 0) && (WC->wc_default_view == 1) )
+                  ||   ( (i == 1) && (WC->wc_default_view == 0) )
+               ) {
+
+                       wprintf("<OPTION %s VALUE=\"/changeview?view=%d\">",
+                               ((i == WC->wc_view) ? "SELECTED" : ""),
+                               i );
+                       escputs(viewdefs[i]);
+                       wprintf("</OPTION>\n");
+               }
        }
        wprintf("</SELECT></FORM>\n");
 }
@@ -467,6 +480,7 @@ void gotoroom(char *gname, int display_name)
        }
        strcpy(WC->wc_roomname, WC->wc_roomname);
        WC->wc_view = extract_int(&buf[4], 11);
+       WC->wc_default_view = extract_int(&buf[4], 12);
 }