From a4b4bb92fa4b339ccfda78e263849ac79ed17607 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 29 Sep 1999 21:13:18 +0000 Subject: [PATCH] * CtdlWriteObject() can now store objects in personal rooms for any specified user -- rather than only the current user or non-personal rooms. --- citadel/ChangeLog | 5 ++++- citadel/msgbase.c | 9 ++++----- citadel/msgbase.h | 2 +- citadel/serv_icq.c | 4 ++-- citadel/serv_vcard.c | 6 ++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index f1bff0031..d69178f37 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,8 @@ $Log$ +Revision 1.375 1999/09/29 21:13:17 ajc +* CtdlWriteObject() can now store objects in personal rooms for any specified + user -- rather than only the current user or non-personal rooms. + Revision 1.374 1999/09/29 17:26:56 ajc * serv_vcard.c: fixed crashola bug in cmd_greg() * tools.c: simplified and improved the string tokenizer. Now it runs in a @@ -1283,4 +1287,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 3d1a07d66..ca2d130f4 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -1916,7 +1916,7 @@ void AdjRefCount(long msgnum, int incr) void CtdlWriteObject(char *req_room, /* Room to stuff it in */ char *content_type, /* MIME type of this object */ char *tempfilename, /* Where to fetch it from */ - int is_mailbox, /* Private mailbox room? */ + struct usersupp *is_mailbox, /* Mailbox room? */ int is_binary, /* Is encoding necessary? */ int is_unique /* Del others of this type? */ ) @@ -1931,12 +1931,11 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ struct CtdlMessage *msg; size_t len; - lprintf(9, "CtdlWriteObject() called\n"); - - if (is_mailbox) - MailboxName(roomname, &CC->usersupp, req_room); + if (is_mailbox != NULL) + MailboxName(roomname, is_mailbox, req_room); else safestrncpy(roomname, req_room, sizeof(roomname)); + lprintf(9, "CtdlWriteObject() to <%s>\n", roomname); strcpy(filename, tmpnam(NULL)); fp = fopen(filename, "w"); diff --git a/citadel/msgbase.h b/citadel/msgbase.h index cac60f9bb..df8dec825 100644 --- a/citadel/msgbase.h +++ b/citadel/msgbase.h @@ -50,7 +50,7 @@ void CtdlForEachMessage(int mode, long ref, char *content_type, void (*CallBack) (long msgnum) ); int CtdlDeleteMessages(char *, long, char *); -void CtdlWriteObject(char *, char *, char *, int, int, int); +void CtdlWriteObject(char *, char *, char *, struct usersupp *, int, int); struct CtdlMessage *CtdlFetchMessage(long msgnum); void CtdlFreeMessage(struct CtdlMessage *msg); void serialize_message(struct ser_ret *, struct CtdlMessage *); diff --git a/citadel/serv_icq.c b/citadel/serv_icq.c index 4e6fd24c5..9e7894815 100644 --- a/citadel/serv_icq.c +++ b/citadel/serv_icq.c @@ -1829,7 +1829,7 @@ void CtdlICQ_Write_Config(void) { fclose(fp); /* this handy API function does all the work for us */ - CtdlWriteObject(ICQROOM, ICQMIME, temp, 1, 0, 1); + CtdlWriteObject(ICQROOM, ICQMIME, temp, &CC->usersupp, 0, 1); unlink(temp); } @@ -1859,7 +1859,7 @@ void CtdlICQ_Write_CL(void) { fclose(fp); /* this handy API function does all the work for us */ - CtdlWriteObject(ICQROOM, ICQCLMIME, temp, 1, 0, 1); + CtdlWriteObject(ICQROOM, ICQCLMIME, temp, &CC->usersupp, 0, 1); unlink(temp); } diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c index 9ba8ceb5f..f2c099365 100644 --- a/citadel/serv_vcard.c +++ b/citadel/serv_vcard.c @@ -133,7 +133,6 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) { char temp[PATH_MAX]; FILE *fp; char *ser; - char config_rm[ROOMNAMELEN]; strcpy(temp, tmpnam(NULL)); ser = vcard_serialize(v); @@ -149,9 +148,8 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) { } fclose(fp); - /* these handy API functions do all the work for us */ - MailboxName(config_rm, u, CONFIGROOM); - CtdlWriteObject(config_rm, "text/x-vcard", temp, 1, 0, 1); + /* This handy API function does all the work for us */ + CtdlWriteObject(CONFIGROOM, "text/x-vcard", temp, u, 0, 1); unlink(temp); } -- 2.30.2