* Got bounce messages working (mostly ... testers, please beat this up!)

[citadel.git] / citadel / serv_vcard.c

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 0ee76514c04be5beea594d55312c5279d1d76cc3..5ecffedf0a6f28013d06a5bf393cdde5387953b1 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -62,10 +62,12 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char buf[256];
 
 
+       if (!CC->logged_in) return(0);  /* Only do this if logged in. */
+
        /* If this isn't the configuration room, or if this isn't a MIME
         * message, don't bother.
         */
-       if (strcasecmp(msg->cm_fields['O'], CONFIGROOM)) return(0);
+       if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
        if (msg->cm_format_type != 4) return(0);
 
        ptr = msg->cm_fields['M'];
@@ -84,11 +86,11 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                         * want to make sure there is absolutely only one
                         * vCard in the user's config room at all times.
                         * 
-                        * FIX ... this needs to be tweaked to allow an admin
+                        * FIXME ... this needs to be tweaked to allow an admin
                         * to make changes to another user's vCard instead of
                         * assuming that it's always the user saving his own.
                         */
-                       MailboxName(config_rm, &CC->usersupp, CONFIGROOM);
+                       MailboxName(config_rm, &CC->usersupp, USERCONFIGROOM);
                        CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
 
                        /* Set the Extended-ID to a standardized one so the
@@ -127,10 +129,12 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
        long I;
 
 
+       if (!CC->logged_in) return(0);  /* Only do this if logged in. */
+
        /* If this isn't the configuration room, or if this isn't a MIME
         * message, don't bother.
         */
-       if (strcasecmp(msg->cm_fields['O'], CONFIGROOM)) return(0);
+       if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
        if (msg->cm_format_type != 4) return(0);
 
        ptr = msg->cm_fields['M'];
@@ -181,7 +185,7 @@ struct vCard *vcard_get_user(struct usersupp *u) {
        struct vCard *v;
 
         strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
-        MailboxName(config_rm, u, CONFIGROOM);
+        MailboxName(config_rm, u, USERCONFIGROOM);
 
         if (getroom(&CC->quickroom, config_rm) != 0) {
                 getroom(&CC->quickroom, hold_rm);
@@ -235,7 +239,7 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) {
         * have to, because the vcard_upload_beforesave() hook above
         * is going to notice what we're trying to do, and delete the old vCard.
         */
-        CtdlWriteObject(CONFIGROOM,    /* which room */
+        CtdlWriteObject(USERCONFIGROOM,        /* which room */
                        "text/x-vcard", /* MIME type */
                        temp,           /* temp file */
                        u,              /* which user */
@@ -409,6 +413,11 @@ void vcard_purge(char *username, long usernum) {
 
         CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL, 1);
         CtdlFreeMessage(msg);
+
+       /* Start a netproc run in the background, so the "purge" message
+        * gets flushed out of the room immediately
+        */
+       system("./netproc &");
 }
        
        
@@ -431,7 +440,7 @@ char *Dynamic_Module_Init(void)
        CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
        CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
        CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
-       create_room(ADDRESS_BOOK_ROOM, 0, "", 0);
+       create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
        return "$Id$";
 }