From: Art Cancro <ajc@citadel.org>
Date: Mon, 1 Nov 2010 17:23:03 +0000 (-0400)
Subject: viewdefs is now boolean
X-Git-Tag: v8.01~618
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d5453f033f5328096c02836c6ad7dac3f2fdf6ec

viewdefs is now boolean
---

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index fcfada6e7..3cf584af9 100644
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -54,12 +54,13 @@ void blogpost_render_and_destroy(struct blogpost *bp) {
 			/* Show the number of comments */
 			wc_printf("<a href=\"readfwd?p=%d?gotofirst=", bp->top_level_id);
 			urlescputs(ChrPtr(WC->CurRoom.name));
-			wc_printf("\">%d comments</a>", bp->num_msgs - 1);
+			wc_printf("#comments\">%d comments</a>", bp->num_msgs - 1);
 		}
 		else if (bp->num_msgs < 2) {
 			wc_printf("dere r no comments here!<br>\n");
 		}
 		else {
+			wc_printf("<a name=\"comments\"></a>\n");
 			wc_printf("%d comments<br>\n", bp->num_msgs - 1);
 			wc_printf("<blockquote>");
 			for (i=1; i<bp->num_msgs; ++i) {
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)