* Added more room name macros

[citadel.git] / citadel / room_ops.c

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);
 
-       if (!strcasecmp(towhere, "_BASEROOM_"))
+       /*
+        * Handle some of the macro named rooms
+        */
+       if (!strcasecmp(towhere, "_BASEROOM_")) {
                safestrncpy(towhere, config.c_baseroom, sizeof towhere);
-
-       if (!strcasecmp(towhere, "_MAIL_"))
+       }
+       else if (!strcasecmp(towhere, "_MAIL_")) {
                safestrncpy(towhere, MAILROOM, sizeof towhere);
-
-       if (!strcasecmp(towhere, "_BITBUCKET_"))
+       }
+       else if (!strcasecmp(towhere, "_BITBUCKET_")) {
                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);