* Added more room name macros

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 10b41862db2c4ccfdf3aeb75645c0172ffb8cbe6..d5c4339295a7ae48497c0654969b62a5392c49b5 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
 $Log$

+Revision 654.13  2005/08/12 02:12:31  ajc
+* Added more room name macros
+

 Revision 654.12  2005/08/11 23:12:26  ajc
 * debian/citadel-server.postinst: remove reference to '?' file
   (patch sent in by W. Goesgens)
 Revision 654.12  2005/08/11 23:12:26  ajc
 * debian/citadel-server.postinst: remove reference to '?' file
   (patch sent in by W. Goesgens)


@@ -7036,4 +7039,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
 
 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 682adddaba5afbe61d88076a8b3d246b809f3a9d..163d449117ae190dee400cb202f80be99077d00e 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -932,15 +932,30 @@ void cmd_goto(char *gargs)
 
        getuser(&CC->user, CC->curr_user);
 
 
        getuser(&CC->user, CC->curr_user);
 

-       if (!strcasecmp(towhere, "_BASEROOM_"))
+       /*
+        * Handle some of the macro named rooms
+        */
+       if (!strcasecmp(towhere, "_BASEROOM_")) {

                safestrncpy(towhere, config.c_baseroom, sizeof towhere);
                safestrncpy(towhere, config.c_baseroom, sizeof towhere);

-
-       if (!strcasecmp(towhere, "_MAIL_"))
+       }
+       else if (!strcasecmp(towhere, "_MAIL_")) {

                safestrncpy(towhere, MAILROOM, sizeof towhere);
                safestrncpy(towhere, MAILROOM, sizeof towhere);

-
-       if (!strcasecmp(towhere, "_BITBUCKET_"))
+       }
+       else if (!strcasecmp(towhere, "_BITBUCKET_")) {

                safestrncpy(towhere, config.c_twitroom, sizeof towhere);
                safestrncpy(towhere, config.c_twitroom, sizeof towhere);

-
+       }
+       else if (!strcasecmp(towhere, "_CALENDAR_")) {
+               safestrncpy(towhere, USERCALENDARROOM, sizeof towhere);
+       }
+       else if (!strcasecmp(towhere, "_TASKS_")) {
+               safestrncpy(towhere, USERTASKSROOM, sizeof towhere);
+       }
+       else if (!strcasecmp(towhere, "_CONTACTS_")) {
+               safestrncpy(towhere, USERCONTACTSROOM, sizeof towhere);
+       }
+       else if (!strcasecmp(towhere, "_NOTES_")) {
+               safestrncpy(towhere, USERNOTESROOM, sizeof towhere);
+       }

 
        /* First try a regular match */
        c = getroom(&QRscratch, towhere);
 
        /* First try a regular match */
        c = getroom(&QRscratch, towhere);

diff --git a/citadel/techdoc/protocol.txt b/citadel/techdoc/protocol.txt
index 525a7eeeaaab25de40eea148bff1a5f828a4f651..18affe1e6eb080510ecf8c2e207aedaee9e85f89 100644 (file)
--- a/citadel/techdoc/protocol.txt
+++ b/citadel/techdoc/protocol.txt
@@ -375,10 +375,14 @@ GOTO command to _BASEROOM_ is guaranteed to succeed.  This is useful to
 allow client software to return to the base room when it doesn't know
 where else to go.
 
 allow client software to return to the base room when it doesn't know
 where else to go.
 

- There are also two additional reserved room names:
- "_MAIL_" translates to the system's designated room for e-mail messages.
- "_BITBUCKET_" goes to whatever room has been chosen for messages
-without a home.
+ There are also several additional reserved room names:
+ "_MAIL_" goes to the user's inbox (i.e. the Mail> room).
+ "_BITBUCKET_" goes to a room that has been chosen for messages without a home.
+ "_CALENDAR_" goes to the user's primary personal calendar.
+ "_CONTACTS_" goes to the user's primary personal address book.
+ "_NOTES_" goes to the user's primary personal notes room.
+ "_TASKS_" goes to the user's primary personal task list.
+ 

 
  The second (and optional) parameter is a password, if one is required for
 access to the room.  This allows for all types of rooms to be accessed via
 
  The second (and optional) parameter is a password, if one is required for
 access to the room.  This allows for all types of rooms to be accessed via