From b509e7dba97ad519febad663b8b3b44d8f2c3974 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 25 Oct 2005 02:53:04 +0000 Subject: [PATCH] * Every user gets a Trash folder. Clients can also use _TRASH_ --- citadel/ChangeLog | 3 +++ citadel/room_ops.c | 3 +++ citadel/sysconfig.h | 1 + citadel/techdoc/protocol.txt | 1 + citadel/user_ops.c | 1 + 5 files changed, 9 insertions(+) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 67f64ccec..c49281094 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,3 +1,6 @@ +Mon Oct 24 22:52:33 EDT 2005 ajc +* Every user gets a Trash folder. Clients can also use _TRASH_ + Mon Oct 24 11:19:47 EDT 2005 ajc * serv_listsub.c: web subscription/confirmation address no longer has http:// prepended to it. This means that clients now must supply that. This was diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 80fada02c..46490bd9d 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -941,6 +941,9 @@ void cmd_goto(char *gargs) else if (!strcasecmp(towhere, "_MAIL_")) { safestrncpy(towhere, MAILROOM, sizeof towhere); } + else if (!strcasecmp(towhere, "_TRASH_")) { + safestrncpy(towhere, USERTRASHROOM, sizeof towhere); + } else if (!strcasecmp(towhere, "_BITBUCKET_")) { safestrncpy(towhere, config.c_twitroom, sizeof towhere); } diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h index 2e285f658..92dbee7a5 100644 --- a/citadel/sysconfig.h +++ b/citadel/sysconfig.h @@ -108,6 +108,7 @@ #define USERTASKSROOM "Tasks" #define USERCONTACTSROOM "Contacts" #define USERNOTESROOM "Notes" +#define USERTRASHROOM "Trash" #define PAGELOGROOM "Sent/Received Pages" #define SYSCONFIGROOM "Local System Configuration" #define SMTP_SPOOLOUT_ROOM "__CitadelSMTPspoolout__" diff --git a/citadel/techdoc/protocol.txt b/citadel/techdoc/protocol.txt index 0c69ad7c4..f2fd17d08 100644 --- a/citadel/techdoc/protocol.txt +++ b/citadel/techdoc/protocol.txt @@ -388,6 +388,7 @@ where else to go. There are also several additional reserved room names: "_MAIL_" goes to the user's inbox (i.e. the Mail> room). + "_TRASH_" goes to the user's personal trashcan room (trash folder). "_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. diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 7ccba3409..1fb0936e6 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -489,6 +489,7 @@ void session_startup(void) */ create_room(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); create_room(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX); + create_room(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); /* Run any startup routines registered by loadable modules */ PerformSessionHooks(EVT_LOGIN); -- 2.30.2