X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomviews.c;fp=webcit%2Froomviews.c;h=42e4be4fe9ab8ab3d34f0f5cd9b696ec4d3ca18d;hb=d5453f033f5328096c02836c6ad7dac3f2fdf6ec;hp=6585835c95af3a67a9d88ba06a4a94963cef983a;hpb=84a2bfa29146319899d779c026bcf928abdfe712;p=citadel.git

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index 6585835c9..42e4be4fe 100644
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -7,34 +7,32 @@
 
 char *viewdefs[VIEW_MAX];			/* the different kinds of available views */
 
-ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {	/* the different kinds of available views for a view */
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_ADDRESSBOOK, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX /*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_TASKS, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_NOTES, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_WIKI, VIEW_MAX, VIEW_MAX, VIEW_MAX}, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX/*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX},
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_JOURNAL, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_BLOG }, 
-	};
-/* the brief calendar view is disabled: VIEW_CALBRIEF */
+ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {
+	{ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1 },	/* bulletin board */
+	{ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1 },	/* mailbox summary */
+	{ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 },	/* address book */
+	{ 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },	/* calendar */
+	{ 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },	/* tasks */
+	{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 },	/* notes */
+	{ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 },	/* wiki */
+	{ 0, 0, 0, 1, 0, 0, 0, 1, 0, 0 },	/* brief calendar */
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 },	/* journal */
+	{ 1, 1, 0, 0, 0, 0, 0, 0, 0, 1 }	/* blog */
+};
 
 ROOM_VIEWS allowed_default_views[VIEW_MAX] = {
 	1, /* VIEW_BBS		Bulletin board view */
-	1, /* VIEW_MAILBOX		Mailbox summary */
+	1, /* VIEW_MAILBOX	Mailbox summary */
 	1, /* VIEW_ADDRESSBOOK	Address book view */
-	1, /* VIEW_CALENDAR		Calendar view */
-	1, /* VIEW_TASKS		Tasks view */
-	1, /* VIEW_NOTES		Notes view */
+	1, /* VIEW_CALENDAR	Calendar view */
+	1, /* VIEW_TASKS	Tasks view */
+	1, /* VIEW_NOTES	Notes view */
 	1, /* VIEW_WIKI		Wiki view */
-	0, /* VIEW_CALBRIEF		Brief Calendar view */
-	0, /* VIEW_JOURNAL		Journal view */
+	0, /* VIEW_CALBRIEF	Brief Calendar view */
+	0, /* VIEW_JOURNAL	Journal view */
 	0  /* VIEW_BLOG		Blog view (not yet implemented) */
 };
 
-
 /*
  * Initialize the viewdefs with localized strings
  */
@@ -215,7 +213,7 @@ int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
 		return 0;
 	}
 
-	return exchangeable_views [WCC->CurRoom.defview][CheckThis] != VIEW_MAX;
+	return exchangeable_views [WCC->CurRoom.defview][CheckThis] ;
 }
 
 void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP)