do {
s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
if (s != NULL) {
- addr = strdoop(s);
+ addr = strdup(s);
striplt(addr);
if (strlen(addr) > 0) {
if (callback != NULL) {
callback(addr, citadel_address);
}
}
- phree(addr);
+ free(addr);
found_something = 1;
}
else {
* probably just the networker or something.
*/
if (CC->logged_in) {
- lprintf(9, "Checking for <%s>...\n", internet_addr);
+ lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr);
if (CtdlDirectoryLookup(buf, internet_addr) == 0) {
if (strcasecmp(buf, citadel_addr)) {
/* This address belongs to someone else.
* Bail out silently without saving.
*/
- lprintf(9, "DOOP!\n");
+ lprintf(CTDL_DEBUG, "DOOP!\n");
return;
}
}
}
- lprintf(9, "ADDING!\n");
+ lprintf(CTDL_INFO, "Adding %s (%s) to directory\n",
+ citadel_addr, internet_addr);
CtdlDirectoryAddUser(internet_addr, citadel_addr);
}
s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
if (s != NULL) {
continue_searching = 1;
- addr = strdoop(s);
+ addr = strdup(s);
striplt(addr);
if (strlen(addr) > 0) {
if (IsDirectory(addr)) {
);
}
}
- phree(addr);
+ free(addr);
}
else {
continue_searching = 0;
* replication always works correctly
*/
if (msg->cm_fields['E'] != NULL)
- phree(msg->cm_fields['E']);
+ free(msg->cm_fields['E']);
if (msg->cm_fields['A'] != NULL)
- phree(msg->cm_fields['A']);
+ free(msg->cm_fields['A']);
- msg->cm_fields['A'] = strdoop(usbuf.fullname);
+ msg->cm_fields['A'] = strdup(usbuf.fullname);
snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
msg->cm_fields['A'], NODENAME);
- msg->cm_fields['E'] = strdoop(buf);
+ msg->cm_fields['E'] = strdup(buf);
/* Now allow the save to complete. */
return(0);
fprintf(fp, "begin:vcard\r\nend:vcard\r\n");
} else {
fwrite(ser, strlen(ser), 1, fp);
- phree(ser);
+ free(ser);
}
fclose(fp);
}
+/*
+ * When a user is being created, create his/her vCard.
+ */
+void vcard_newuser(struct ctdluser *usbuf) {
+ char buf[SIZ];
+ char vname[SIZ];
+
+ char lastname[SIZ];
+ char firstname[SIZ];
+ char middlename[SIZ];
+ char honorific_prefixes[SIZ];
+ char honorific_suffixes[SIZ];
+
+ struct vCard *v;
+ int i;
+
+ /* Try to intelligently convert the screen name to a
+ * fully expanded vCard name based on the number of
+ * words in the name
+ */
+ strcpy(lastname, "");
+ strcpy(firstname, "");
+ strcpy(middlename, "");
+ strcpy(honorific_prefixes, "");
+ strcpy(honorific_suffixes, "");
+
+ strcpy(buf, usbuf->fullname);
+
+ /* Honorific suffixes */
+ if (num_tokens(buf, ',') > 1) {
+ extract_token(honorific_suffixes, buf, (num_tokens(buf, ' ') - 1), ',');
+ remove_token(buf, (num_tokens(buf, ',') - 1), ',');
+ }
+
+ /* Find a last name */
+ extract_token(lastname, buf, (num_tokens(buf, ' ') - 1), ' ');
+ remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+
+ /* Find honorific prefixes */
+ if (num_tokens(buf, ' ') > 2) {
+ extract_token(honorific_prefixes, buf, 0, ' ');
+ remove_token(buf, 0, ' ');
+ }
+
+ /* Find a middle name */
+ if (num_tokens(buf, ' ') > 1) {
+ extract_token(middlename, buf, (num_tokens(buf, ' ') - 1), ' ');
+ remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+ }
+
+ /* Anything left is probably the first name */
+ strcpy(firstname, buf);
+ striplt(firstname);
+
+ /* Compose the structured name */
+ sprintf(vname, "%s;%s;%s;%s;%s", lastname, firstname, middlename,
+ honorific_prefixes, honorific_suffixes);
+
+ lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
+
+ /* Create and save the vCard */
+ v = vcard_new();
+ if (v == NULL) return;
+ sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
+ for (i=0; i<strlen(buf); ++i) {
+ if (buf[i] == ' ') buf[i] = '_';
+ }
+ vcard_add_prop(v, "fn", usbuf->fullname);
+ vcard_add_prop(v, "n", vname);
+ vcard_add_prop(v, "email;internet", buf);
+ vcard_write_user(usbuf, v);
+ vcard_free(v);
+}
+
+
/*
* 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) {
+void vcard_purge(struct ctdluser *usbuf) {
struct CtdlMessage *msg;
char buf[SIZ];
- msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+ msg = (struct CtdlMessage *) malloc(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");
+ msg->cm_fields['A'] = strdup(usbuf->fullname);
+ msg->cm_fields['O'] = strdup(ADDRESS_BOOK_ROOM);
+ msg->cm_fields['N'] = strdup(NODENAME);
+ msg->cm_fields['M'] = strdup("Purge this vCard\n");
snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
msg->cm_fields['A'], NODENAME);
- msg->cm_fields['E'] = strdoop(buf);
+ msg->cm_fields['E'] = strdup(buf);
- msg->cm_fields['S'] = strdoop("CANCEL");
+ msg->cm_fields['S'] = strdup("CANCEL");
CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
CtdlFreeMessage(msg);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERCONTACTSROOM)) {
- lprintf(3, "Couldn't get the user CONTACTS room!\n");
+ lprintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n");
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
CtdlRegisterProtoHook(cmd_igab, "IGAB",
"Initialize Global Address Book");
CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
+ CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
CtdlRegisterNetprocHook(vcard_extract_from_network);
projects / citadel.git / blobdiff