projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3180c7a
)
* Every user gets a Trash folder. Clients can also use _TRASH_
author
Art Cancro
<ajc@citadel.org>
Tue, 25 Oct 2005 02:53:04 +0000
(
02:53
+0000)
committer
Art Cancro
<ajc@citadel.org>
Tue, 25 Oct 2005 02:53:04 +0000
(
02:53
+0000)
citadel/ChangeLog
patch
|
blob
|
history
citadel/room_ops.c
patch
|
blob
|
history
citadel/sysconfig.h
patch
|
blob
|
history
citadel/techdoc/protocol.txt
patch
|
blob
|
history
citadel/user_ops.c
patch
|
blob
|
history
diff --git
a/citadel/ChangeLog
b/citadel/ChangeLog
index 67f64ccec1bbc450b3071a5749f551d7e557ae3b..c49281094b3df84c7f9e85bc6f63295508453ea6 100644
(file)
--- 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
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 80fada02cd0ba74dbb11f610f163f882f11410a5..46490bd9dd0702c783681ec3f83aff7cc3746e91 100644
(file)
--- 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, "_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);
}
else if (!strcasecmp(towhere, "_BITBUCKET_")) {
safestrncpy(towhere, config.c_twitroom, sizeof towhere);
}
diff --git
a/citadel/sysconfig.h
b/citadel/sysconfig.h
index 2e285f658f29f5c09ad4f97dc50848d0a1b5b7d1..92dbee7a5d4906c96bb88b707fe7f37ed4a1e45d 100644
(file)
--- a/
citadel/sysconfig.h
+++ b/
citadel/sysconfig.h
@@
-108,6
+108,7
@@
#define USERTASKSROOM "Tasks"
#define USERCONTACTSROOM "Contacts"
#define USERNOTESROOM "Notes"
#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__"
#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 0c69ad7c4da9d917a1c016b7a787bf2afe16f316..f2fd17d08483957567d273faafa136f2e73192cd 100644
(file)
--- 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).
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.
"_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 7ccba3409c9548e513ab95402a7e092a3f74ec16..1fb0936e629a818857b1cfc6cfdd58a5e9a0c7eb 100644
(file)
--- 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(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);
/* Run any startup routines registered by loadable modules */
PerformSessionHooks(EVT_LOGIN);