From: Art Cancro <ajc@citadel.org>
Date: Tue, 14 Jan 2003 04:12:26 +0000 (+0000)
Subject: * Set default view for new user Calendar> rooms to 3 (calendar)
X-Git-Tag: v7.86~6043
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e1956292261d43e33ba3fb3510b4015b30463196;p=citadel.git

* Set default view for new user Calendar> rooms to 3 (calendar)
* Set default view for new user Tasks> rooms to 4 (tasks)
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 9fa3b27f9..9c40d6dee 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 601.108  2003/01/14 04:12:26  ajc
+ * Set default view for new user Calendar> rooms to 3 (calendar)
+ * Set default view for new user Tasks> rooms to 4 (tasks)
+
  Revision 601.107  2003/01/13 17:04:19  ajc
  * Add a sample URL view command for Macintosh in the included citadel.rc
 
@@ -4367,4 +4371,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
 	* Initial CVS import
-
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 26304187b..fdba64de0 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -806,19 +806,28 @@ void usergoto(char *where, int display_result, int transiently,
 	if (retmsgs != NULL) *retmsgs = total_messages;
 	if (retnew != NULL) *retnew = new_messages;
 	lprintf(9, "<%s> %d new of %d total messages\n",
-		CC->quickroom.QRname, new_messages, total_messages);
+		CC->quickroom.QRname,
+		new_messages, total_messages
+	);
 
-	if (display_result)
-		cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d\n",
+	if (display_result) {
+		cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d|%d|%d|\n",
 			CIT_OK, CtdlCheckExpress(),
 			truncated_roomname,
-			new_messages, total_messages,
-			info, CC->quickroom.QRflags,
-			CC->quickroom.QRhighest,
-			vbuf.v_lastseen,
-			rmailflag, raideflag, newmailcount,
-			CC->quickroom.QRfloor,
-			vbuf.v_view);
+			(int)new_messages,
+			(int)total_messages,
+			(int)info,
+			(int)CC->quickroom.QRflags,
+			(long)CC->quickroom.QRhighest,
+			(long)vbuf.v_lastseen,
+			(int)rmailflag,
+			(int)raideflag,
+			(int)newmailcount,
+			(int)CC->quickroom.QRfloor,
+			(int)vbuf.v_view,
+			(int)CC->quickroom.QRdefaultview
+		);
+	}
 }
 
 
diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 60d6db947..0331dde22 100644
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -1013,6 +1013,7 @@ void ical_create_room(void)
 		return;
 	}
 	qr.QRep.expire_mode = EXPIRE_MANUAL;
+	qr.QRdefaultview = 3;	/* 3 = calendar view */
 	lputroom(&qr);
 
 	/* Set the view to a calendar view */
@@ -1029,6 +1030,7 @@ void ical_create_room(void)
 		return;
 	}
 	qr.QRep.expire_mode = EXPIRE_MANUAL;
+	qr.QRdefaultview = 4;	/* 4 = tasks view */
 	lputroom(&qr);
 
 	/* Set the view to a task list view */
diff --git a/citadel/techdoc/session.txt b/citadel/techdoc/session.txt
index 2f0907a97..a9d5710f8 100644
--- a/citadel/techdoc/session.txt
+++ b/citadel/techdoc/session.txt
@@ -413,7 +413,13 @@ a regular Aide (this makes access checks easy).
    9. The number of new Mail messages the user has (useful for alerting the
 user to the arrival of new mail during a session)
   10. The floor number this room resides on
-  11. The current "view" for this room (see views.txt for more info)
+  11. The *current* "view" for this room (see views.txt for more info)
+  12. The *default* "view" for this room
+ 
+ The default view gives the client a hint as to what views the user should
+be allowed to select.  For example, it would be confusing to allow messages
+in a room intended for calendar items.  The server does not enforce these
+restrictions, though.
 
 
  MSGS   (get pointers to MeSsaGeS in this room)