#define ADDRESS_BOOK_ROOM "Global Address Book"
/*
- * Format of the "Extended ID" field of the message containing a user's
+ * Format of the "Exclusive ID" field of the message containing a user's
* vCard. Doesn't matter what it really looks like as long as it's both
* unique and consistent (because we use it for replication checking to
* delete the old vCard network-wide when the user enters a new one).
void vcard_add_to_directory(long msgnum, void *data) {
struct CtdlMessage *msg;
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
vcard_extract_internet_addresses(msg, vcard_directory_add_user);
}
*/
int vcard_upload_beforesave(struct CtdlMessage *msg) {
char *ptr;
+ char *s;
int linelen;
char buf[SIZ];
struct ctdluser usbuf;
long what_user;
+ 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);
}
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) );
- }
+
+ 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 if (getuserbynumber(&usbuf, what_user) == 0) {
- /* We fetched a valid user record */
- }
-
- else {
- /* No user with that number! */
- return(0);
+ 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");
+
+ /* 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);
}
- /* 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");
+ /* Manipulate the vCard data structure */
+ v = vcard_load(msg->cm_fields['M']);
+ if (v != NULL) {
+
+ /* 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);
+ }
- /* 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 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);
+ }
+ }
- if (msg->cm_fields['A'] != NULL)
- free(msg->cm_fields['A']);
+ /* 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);
+ }
- msg->cm_fields['A'] = strdup(usbuf.fullname);
+ /* 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);
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
- msg->cm_fields['A'], NODENAME);
- msg->cm_fields['E'] = strdup(buf);
+ /* Re-serialize it back into the msg body */
+ ser = vcard_serialize(v);
+ if (ser != NULL) {
+ msg->cm_fields['M'] = realloc(
+ msg->cm_fields['M'],
+ strlen(ser) + 1024
+ );
+ sprintf(msg->cm_fields['M'],
+ "Content-type: text/x-vcard"
+ "\r\n\r\n%s\r\n", ser);
+ free(ser);
+ }
+ vcard_free(v);
+ }
/* Now allow the save to complete. */
return(0);
I = atol(msg->cm_fields['I']);
if (I < 0L) return(0);
+ /* Store our Internet return address in memory */
+ v = vcard_load(msg->cm_fields['M']);
+ vcard_populate_cs_inet_email(v);
+ vcard_free(v);
+
/* Put it in the Global Address Book room... */
CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
(SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
/* ...and also in the directory database. */
vcard_add_to_directory(I, NULL);
- /* Store our Internet return address in memory */
- v = vcard_load(msg->cm_fields['M']);
- vcard_populate_cs_inet_email(v);
- vcard_free(v);
-
/* Some sites want an Aide to be notified when a
* user registers or re-registers...
*/
if (VC->msgnum < 0L) return vcard_new();
- msg = CtdlFetchMessage(VC->msgnum);
+ msg = CtdlFetchMessage(VC->msgnum, 1);
if (msg == NULL) return vcard_new();
v = vcard_load(msg->cm_fields['M']);
char tmpaddress[SIZ];
char tmpcountry[SIZ];
+ unbuffer_output();
+
if (!(CC->logged_in)) {
cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN);
return;
/*
* 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.
+ * field, and the same Exclusive ID as the existing card.
*/
void vcard_purge(struct ctdluser *usbuf) {
struct CtdlMessage *msg;
return;
}
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
ptr = msg->cm_fields['M'];
struct visit vbuf;
/* Create the calendar room if it doesn't already exist */
- create_room(USERCONTACTSROOM, 4, "", 0, 1, 0);
+ create_room(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERCONTACTSROOM)) {
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
- qr.QRdefaultview = 2; /* 2 = address book view */
+ qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */
lputroom(&qr);
/* Set the view to a calendar view */
CtdlRegisterNetprocHook(vcard_extract_from_network);
/* Create the Global ADdress Book room if necessary */
- create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0);
+ create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (!lgetroom(&qr, ADDRESS_BOOK_ROOM)) {
qr.QRep.expire_mode = EXPIRE_MANUAL;
- qr.QRdefaultview = 2; /* 2 = address book view */
+ qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */
lputroom(&qr);
}
projects / citadel.git / blobdiff