]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_vcard.c
* Got bounce messages working (mostly ... testers, please beat this up!)
[citadel.git] / citadel / serv_vcard.c
index 1881a2318cde8da898e1b6fe69c7e586569bc09e..5ecffedf0a6f28013d06a5bf393cdde5387953b1 100644 (file)
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include "citadel.h"
 #include "server.h"
-#include <syslog.h>
 #include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
@@ -53,14 +49,6 @@ unsigned long SYM_VCARD;
 #define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
 
 
-/*
- * back end function used for callbacks
- */
-void vcard_gm_backend(long msgnum) {
-       VC->msgnum = msgnum;
-}
-
-
 /*
  * This handler detects whether the user is attempting to save a new
  * vCard as part of his/her personal configuration, and handles the replace
@@ -70,15 +58,16 @@ void vcard_gm_backend(long msgnum) {
 int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
-        char hold_rm[ROOMNAMELEN];
         char config_rm[ROOMNAMELEN];
        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'];
@@ -92,27 +81,30 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                         * delete the old one.
                         */
 
-                       strcpy(hold_rm, CC->quickroom.QRname);  /* save rm */
-                       MailboxName(config_rm, &CC->usersupp, CONFIGROOM);
-
-                       if (getroom(&CC->quickroom, config_rm) != 0) {
-                               getroom(&CC->quickroom, hold_rm);
-                               return(1);                      /* abort */
-                       }
-                       VC->msgnum = (-1L);
-                       CtdlForEachMessage(MSGS_ALL, 0,
-                               "text/x-vcard", NULL, vcard_gm_backend);
-
-                       if (VC->msgnum >= 0) {
-                               if (msg->cm_fields['Z'] != NULL)
-                                       phree(msg->cm_fields['Z']);
-                               sprintf(buf, "%ld@%s", VC->msgnum, NODENAME);
-                               msg->cm_fields['Z'] = strdoop(buf);
-                       }
-
+                       /* Delete the user's old vCard.  This would probably
+                        * get taken care of by the replication check, but we
+                        * want to make sure there is absolutely only one
+                        * vCard in the user's config room at all times.
+                        * 
+                        * 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, USERCONFIGROOM);
                        CtdlDeleteMessages(config_rm, 0L, "text/x-vcard");
 
-                       getroom(&CC->quickroom, hold_rm);       /* return rm */
+                       /* Set the Extended-ID to a standardized one so the
+                        * replication always works correctly
+                        */
+                        if (msg->cm_fields['E'] != NULL)
+                                phree(msg->cm_fields['E']);
+
+                        sprintf(buf,
+                                "Citadel vCard: personal card for %s at %s",
+                                msg->cm_fields['A'], NODENAME);
+                        msg->cm_fields['E'] = strdoop(buf);
+
+                       /* Now allow the save to complete. */
                        return(0);
                }
 
@@ -134,15 +126,15 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 int vcard_upload_aftersave(struct CtdlMessage *msg) {
        char *ptr;
        int linelen;
-       long Z, I;
-       struct quickroom qrbuf;
-       char buf[256];
+       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'];
@@ -159,23 +151,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
                        I = atol(msg->cm_fields['I']);
                        if (I < 0L) return(0);
 
-                       Z = (-1L);
-                       if (msg->cm_fields['Z'] != NULL) {
-                               extract_token(buf, msg->cm_fields['Z'], 1, '@');
-                               if (!strcasecmp(buf, NODENAME)) {
-                                       extract_token(buf, msg->cm_fields['Z'],
-                                               0, '@');
-                                       Z = atol(buf);
-                               }
-                       }
-
-                       if (getroom(&qrbuf, ADDRESS_BOOK_ROOM) != 0) return(0);
-                       AddMessageToRoom(&qrbuf, I);
-                       AdjRefCount(I, +1);
-
-                       if (Z > 0L) {
-                               CtdlDeleteMessages(ADDRESS_BOOK_ROOM, Z, NULL); 
-                       }
+                       CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
+                               (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
 
                        return(0);
                }
@@ -189,6 +166,14 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
 
 
+/*
+ * back end function used for callbacks
+ */
+void vcard_gu_backend(long msgnum) {
+       VC->msgnum = msgnum;
+}
+
+
 /*
  * If this user has a vcard on disk, read it into memory, otherwise allocate
  * and return an empty vCard.
@@ -200,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);
@@ -210,7 +195,7 @@ struct vCard *vcard_get_user(struct usersupp *u) {
         /* We want the last (and probably only) vcard in this room */
        VC->msgnum = (-1);
         CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
-               NULL, vcard_gm_backend);
+               NULL, vcard_gu_backend);
         getroom(&CC->quickroom, hold_rm);      /* return to saved room */
 
        if (VC->msgnum < 0L) return vcard_new();
@@ -254,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 */
@@ -279,7 +264,6 @@ void cmd_regi(char *argbuf) {
        char tmpcity[256];
        char tmpstate[256];
        char tmpzip[256];
-       char tmpphone[256];
        char tmpaddress[512];
 
        if (!(CC->logged_in)) {
@@ -309,17 +293,7 @@ void cmd_regi(char *argbuf) {
                                        }
                                }
                        }
-               if (a==5) {
-                       strcpy(tmpphone, "");
-                       for (c=0; c<strlen(buf); ++c) {
-                               if ((buf[c]>='0')&&(buf[c]<='9')) {
-                                       b=strlen(tmpphone);
-                                       tmpphone[b]=buf[c];
-                                       tmpphone[b+1]=0;
-                                       }
-                               }
-                       vcard_set_prop(my_vcard, "tel;home", tmpphone);
-                       }
+               if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
                if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
                ++a;
                }
@@ -409,13 +383,54 @@ void cmd_greg(char *argbuf)
        }
 
 
+/*
+ * When a user is being deleted, we have to remove his/her vCard.
+ * This is accomplished by issuing a message with 'CANCEL' in the S (special)
+ * field, and the same Extended ID as the existing card.
+ */
+void vcard_purge(char *username, long usernum) {
+       struct CtdlMessage *msg;
+       char buf[256];
+
+       msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+       if (msg == NULL) return;
+       memset(msg, 0, sizeof(struct CtdlMessage));
+
+        msg->cm_magic = CTDLMESSAGE_MAGIC;
+        msg->cm_anon_type = MES_NORMAL;
+        msg->cm_format_type = 0;
+        msg->cm_fields['A'] = strdoop(username);
+        msg->cm_fields['O'] = strdoop(ADDRESS_BOOK_ROOM);
+        msg->cm_fields['N'] = strdoop(NODENAME);
+        msg->cm_fields['M'] = strdoop("Purge this vCard\n");
+
+        sprintf(buf,
+                "Citadel vCard: personal card for %s at %s",
+                msg->cm_fields['A'], NODENAME);
+        msg->cm_fields['E'] = strdoop(buf);
+
+       msg->cm_fields['S'] = strdoop("CANCEL");
 
+        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 &");
+}
+       
+       
+
+
+/*
+ * Session startup, allocate some per-session data
+ */
 void vcard_session_startup_hook(void) {
        CtdlAllocUserData(SYM_VCARD, sizeof(struct vcard_internal_info));
 }
 
 
-
 char *Dynamic_Module_Init(void)
 {
        SYM_VCARD = CtdlGetDynamicSymbol();
@@ -424,6 +439,10 @@ char *Dynamic_Module_Init(void)
        CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
        CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
        CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
-       create_room(ADDRESS_BOOK_ROOM, 0, "", 0);
+       CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
+       create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
        return "$Id$";
 }
+
+
+