#include "support.h"
#include "config.h"
#include "control.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
+/*
+ * set global flag calling for an aide to validate new users
+ */
+void set_mm_valid(void) {
+ begin_critical_section(S_CONTROL);
+ get_control();
+ CitControl.MMflags = CitControl.MMflags | MM_VALID ;
+ put_control();
+ end_critical_section(S_CONTROL);
+}
+
+
+
/*
* Extract Internet e-mail addresses from a message containing a vCard, and
* perform a callback for any found.
if (CtdlAccessCheck(ac_aide)) return;
- strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
- if (getroom(&CC->quickroom, ADDRESS_BOOK_ROOM) != 0) {
- getroom(&CC->quickroom, hold_rm);
+ if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
+ getroom(&CC->room, hold_rm);
cprintf("%d cannot get address book room\n", ERROR);
return;
}
CtdlDirectoryInit();
/* We want the last (and probably only) vcard in this room */
- CtdlForEachMessage(MSGS_ALL, 0, (-127), "text/x-vcard",
+ CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard",
NULL, vcard_add_to_directory, NULL);
- getroom(&CC->quickroom, hold_rm); /* return to saved room */
- cprintf("%d Directory has been rebuilt.\n", OK);
+ getroom(&CC->room, hold_rm); /* return to saved room */
+ cprintf("%d Directory has been rebuilt.\n", CIT_OK);
}
/*
* See if there is a valid Internet address in a vCard to use for outbound
- * Interet messages. If there is, stick it in CC->cs_inet_email.
+ * Internet messages. If there is, stick it in CC->cs_inet_email.
*/
void vcard_populate_cs_inet_email(struct vCard *v) {
char *s, *addr;
int continue_searching = 1;
int instance = 0;
- /*
- * Clear whatever was in there previously.
- */
- if (CC->cs_inet_email != NULL) {
- phree(CC->cs_inet_email);
- CC->cs_inet_email = NULL;
- }
-
/* Go through the vCard searching for *all* instances of
* the "email;internet" key
*/
if (strlen(addr) > 0) {
if (IsDirectory(addr)) {
continue_searching = 0;
- CC->cs_inet_email = strdoop(addr);
+ safestrncpy(CC->cs_inet_email,
+ addr,
+ sizeof(CC->cs_inet_email)
+ );
}
}
phree(addr);
int vcard_upload_beforesave(struct CtdlMessage *msg) {
char *ptr;
int linelen;
- char config_rm[ROOMNAMELEN];
char buf[SIZ];
+ struct ctdluser usbuf;
+ long what_user;
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. (Check for NULL room first, otherwise
- * some messages will cause it to crash!!)
- */
- if (msg->cm_fields['O'] == NULL) return(0);
- if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
+ /* If this isn't a "My Citadel Config" room, don't bother. */
+ if ( (CC->room.QRflags && QR_MAILBOX)
+ && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+ /* Yes, we want to do this */
+ }
+ else {
+ return(0);
+ }
+
+ /* If this isn't a MIME message, don't bother. */
if (msg->cm_format_type != 4) return(0);
+ /* Ok, if we got this far, look into the situation further... */
+
ptr = msg->cm_fields['M'];
if (ptr == NULL) return(0);
while (ptr != NULL) {
if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
/* Bingo! The user is uploading a new vCard, so
- * delete the old one.
+ * 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.
- *
- * 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");
+ 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)
phree(msg->cm_fields['E']);
+ if (msg->cm_fields['A'] != NULL)
+ phree(msg->cm_fields['A']);
+
+ msg->cm_fields['A'] = strdoop(usbuf.fullname);
+
snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
msg->cm_fields['A'], NODENAME);
msg->cm_fields['E'] = strdoop(buf);
vcard_populate_cs_inet_email(v);
vcard_free(v);
+ /* Some sites want an Aide to be notified when a
+ * user registers or re-registers...
+ */
+ set_mm_valid();
+
+ /* ...which also means we need to flag the user */
+ lgetuser(&CC->user, CC->curr_user);
+ CC->user.flags |= (US_REGIS|US_NEEDVALID);
+ lputuser(&CC->user);
+
return(0);
}
* If this user has a vcard on disk, read it into memory, otherwise allocate
* and return an empty vCard.
*/
-struct vCard *vcard_get_user(struct usersupp *u) {
+struct vCard *vcard_get_user(struct ctdluser *u) {
char hold_rm[ROOMNAMELEN];
char config_rm[ROOMNAMELEN];
struct CtdlMessage *msg;
struct vCard *v;
- strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
- MailboxName(config_rm, u, USERCONFIGROOM);
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
+ MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
- if (getroom(&CC->quickroom, config_rm) != 0) {
- getroom(&CC->quickroom, hold_rm);
+ if (getroom(&CC->room, config_rm) != 0) {
+ getroom(&CC->room, hold_rm);
return vcard_new();
}
/* We want the last (and probably only) vcard in this room */
VC->msgnum = (-1);
- CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard",
+ CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
NULL, vcard_gu_backend, NULL);
- getroom(&CC->quickroom, hold_rm); /* return to saved room */
+ getroom(&CC->room, hold_rm); /* return to saved room */
if (VC->msgnum < 0L) return vcard_new();
/*
* Write our config to disk
*/
-void vcard_write_user(struct usersupp *u, struct vCard *v) {
+void vcard_write_user(struct ctdluser *u, struct vCard *v) {
char temp[PATH_MAX];
FILE *fp;
char *ser;
return;
}
- my_vcard = vcard_get_user(&CC->usersupp);
+ my_vcard = vcard_get_user(&CC->user);
strcpy(tmpaddr, "");
strcpy(tmpcity, "");
strcpy(tmpstate, "");
snprintf(tmpaddress, sizeof tmpaddress, ";;%s;%s;%s;%s;%s",
tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry);
vcard_set_prop(my_vcard, "adr", tmpaddress, 0);
- vcard_write_user(&CC->usersupp, my_vcard);
+ vcard_write_user(&CC->user, my_vcard);
vcard_free(my_vcard);
-
- lgetuser(&CC->usersupp, CC->curr_user);
- CC->usersupp.flags=(CC->usersupp.flags|US_REGIS|US_NEEDVALID);
- lputuser(&CC->usersupp);
-
- /* set global flag calling for validation */
- begin_critical_section(S_CONTROL);
- get_control();
- CitControl.MMflags = CitControl.MMflags | MM_VALID ;
- put_control();
- end_critical_section(S_CONTROL);
}
-
/*
* Protocol command to fetch registration info for a user
*/
void cmd_greg(char *argbuf)
{
- struct usersupp usbuf;
+ struct ctdluser usbuf;
struct vCard *v;
char *s;
char who[SIZ];
if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user);
- if ((CC->usersupp.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
+ if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
cprintf("%d Higher access required.\n",
ERROR+HIGHER_ACCESS_REQUIRED);
return;
msg->cm_fields['N'] = strdoop(NODENAME);
msg->cm_fields['M'] = strdoop("Purge this vCard\n");
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME);
+ snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+ msg->cm_fields['A'], NODENAME);
msg->cm_fields['E'] = strdoop(buf);
msg->cm_fields['S'] = strdoop("CANCEL");
if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
/* Bingo! A vCard is being deleted.
*/
- vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser);
+ vcard_extract_internet_addresses(msg,
+ CtdlDirectoryDelUser);
}
ptr = strchr((char *)ptr, '\n');
if (ptr != NULL) ++ptr;
return;
}
- cprintf("%d %s\n", OK, citadel_addr);
+ cprintf("%d %s\n", CIT_OK, citadel_addr);
}
void vcard_session_login_hook(void) {
struct vCard *v;
- v = vcard_get_user(&CC->usersupp);
+ v = vcard_get_user(&CC->user);
vcard_populate_cs_inet_email(v);
vcard_free(v);
}
-/*
- * When a user logs out...
- */
-void vcard_session_logout_hook(void) {
- if (CC->cs_inet_email != NULL) {
- phree(CC->cs_inet_email);
- CC->cs_inet_email = NULL;
- }
-}
-
-char *Dynamic_Module_Init(void)
+char *serv_vcard_init(void)
{
SYM_VCARD = CtdlGetDynamicSymbol();
CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START);
CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
- CtdlRegisterSessionHook(vcard_session_logout_hook, EVT_LOGOUT);
CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
CtdlRegisterDeleteHook(vcard_delete_remove);
CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
CtdlRegisterNetprocHook(vcard_extract_from_network);
- create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1);
+ create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0);
return "$Id$";
}
projects / citadel.git / blobdiff