* serv_vcard.c: changed the logic a bit. When saving a vCard to a user's

  "My Citadel Config" room, force-feed the vCard a site-compliant UID and
  FBURL.  When saving a vCard to *any* address book room, set the Citadel
  EUID to the vCard UID.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4599adfa702db8a7f6082fc722323de0951e9cb8..1e10495959c49c0de35baa0ef63198b5cb0ab33e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 630.7  2005/01/27 21:59:22  ajc
+ * serv_vcard.c: changed the logic a bit.  When saving a vCard to a user's
+   "My Citadel Config" room, force-feed the vCard a site-compliant UID and
+   FBURL.  When saving a vCard to *any* address book room, set the Citadel
+   EUID to the vCard UID.
+
  Revision 630.6  2005/01/27 17:33:52  ajc
  * The before-save hook in serv_calendar.c now runs for any room with a
    view of VIEW_CALENDAR or VIEW_TASKS, not just Calendar> and Tasks>.
@@ -6320,4 +6326,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index a776f022f1c6f1829828c9feed8a16aa8488e168..b82ffbf9432c1dc15056d1b675833436535fa1f3 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -258,6 +258,7 @@ void vcard_populate_cs_inet_email(struct vCard *v) {
  */
 int vcard_upload_beforesave(struct CtdlMessage *msg) {
        char *ptr;
+       char *s;
        int linelen;
        char buf[SIZ];
        struct ctdluser usbuf;
@@ -265,15 +266,25 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
        struct vCard *v = NULL;
        char *ser = NULL;
        int i = 0;
+       int yes_my_citadel_config = 0;
+       int yes_any_vcard_room = 0;
 
        if (!CC->logged_in) return(0);  /* Only do this if logged in. */
 
-       /* If this isn't a "My Citadel Config" room, don't bother. */
+       /* Is this some user's "My Citadel Config" room? */
        if ( (CC->room.QRflags && QR_MAILBOX)
           && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
                /* Yes, we want to do this */
+               yes_my_citadel_config = 1;
        }
-       else {
+
+       /* Is this a room with an address book in it? */
+       if (CC->curr_view == VIEW_ADDRESSBOOK) {
+               yes_any_vcard_room = 1;
+       }
+
+       /* If neither condition exists, don't run this hook. */
+       if ( (!yes_my_citadel_config) && (!yes_any_vcard_room) ) {
                return(0);
        }
 
@@ -290,62 +301,82 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
                if (linelen == 0) return(0);    /* end of headers */    
                
                if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
-                       /* Bingo!  The user is uploading a new vCard, so
-                        * delete the old one.  First, figure out which user
-                        * is being re-registered...
-                        */
-                       what_user = atol(CC->room.QRname);
-
-                       if (what_user == CC->user.usernum) {
-                               /* It's the logged in user.  That was easy. */
-                               memcpy(&usbuf, &CC->user,
-                                       sizeof(struct ctdluser) );
-                       }
-                       
-                       else if (getuserbynumber(&usbuf, what_user) == 0) {
-                               /* We fetched a valid user record */
-                       }
-               
-                       else {
-                               /* No user with that number! */
-                               return(0);
-                       }
-
-                       /* 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.
-                        */
-                       CtdlDeleteMessages(CC->room.QRname,
-                                       0L, "text/x-vcard");
-
-                       /* Set the Extended-ID to a standardized one so the
-                        * replication always works correctly
-                        */
-                        if (msg->cm_fields['E'] != NULL)
-                                free(msg->cm_fields['E']);
 
-                        if (msg->cm_fields['A'] != NULL)
-                                free(msg->cm_fields['A']);
 
-                       msg->cm_fields['A'] = strdup(usbuf.fullname);
+                       if (yes_my_citadel_config) {
+                               /* Bingo!  The user is uploading a new vCard, so
+                                * delete the old one.  First, figure out which user
+                                * is being re-registered...
+                                */
+                               what_user = atol(CC->room.QRname);
+       
+                               if (what_user == CC->user.usernum) {
+                                       /* It's the logged in user.  That was easy. */
+                                       memcpy(&usbuf, &CC->user,
+                                               sizeof(struct ctdluser) );
+                               }
+                               
+                               else if (getuserbynumber(&usbuf, what_user) == 0) {
+                                       /* We fetched a valid user record */
+                               }
+                       
+                               else {
+                                       /* No user with that number! */
+                                       return(0);
+                               }
+       
+                               /* 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.
+                                */
+                               CtdlDeleteMessages(CC->room.QRname,
+                                               0L, "text/x-vcard");
 
-                        snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
-                                msg->cm_fields['A'], NODENAME);
-                        msg->cm_fields['E'] = strdup(buf);
+                               /* Make the author of the message the name of the user.
+                                */
+                               if (msg->cm_fields['A'] != NULL) {
+                                       free(msg->cm_fields['A']);
+                               }
+                               msg->cm_fields['A'] = strdup(usbuf.fullname);
+                       }
 
-                       /* Insert or replace RFC2739-compliant free/busy URL */
+                       /* Manipulate the vCard data structure */
                        v = vcard_load(msg->cm_fields['M']);
                        if (v != NULL) {
 
-                               /* Manipulate the vCard data structure */
-                               sprintf(buf, "http://%s/%s.vfb",
-                                       config.c_fqdn,
-                                       usbuf.fullname);
-                               for (i=0; i<strlen(buf); ++i) {
-                                       if (buf[i] == ' ') buf[i] = '_';
+                               /* Insert or replace RFC2739-compliant free/busy URL */
+                               if (yes_my_citadel_config) {
+                                       sprintf(buf, "http://%s/%s.vfb",
+                                               config.c_fqdn,
+                                               usbuf.fullname);
+                                       for (i=0; i<strlen(buf); ++i) {
+                                               if (buf[i] == ' ') buf[i] = '_';
+                                       }
+                                       vcard_set_prop(v, "FBURL;PREF", buf, 0);
+                               }
+
+                               /* If this is an address book room, and the vCard has
+                                * no UID, then give it one.
+                                */
+                               if (yes_any_vcard_room) {
+                                       s = vcard_get_prop(v, "UID", 0, 0, 0);
+                                       if (s == NULL) {
+                                               generate_uuid(buf);
+                                               vcard_set_prop(v, "UID", buf, 0);
+                                       }
+                               }
+
+                               /* Enforce local UID policy if applicable */
+                               if (yes_my_citadel_config) {
+                                       snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+                                               msg->cm_fields['A'], NODENAME);
+                                       vcard_set_prop(v, "UID", buf, 0);
                                }
-                               vcard_set_prop(v, "FBURL;PREF", buf, 0);
+
+                               /* Set the EUID of the message to the UID of the vCard */
+                               if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
+                               msg->cm_fields['E'] = strdup(buf);
 
                                /* Re-serialize it back into the msg body */
                                ser = vcard_serialize(v);