int instance = 0;
int found_something = 0;
- if (msg->cm_fields['A'] == NULL) return;
- if (msg->cm_fields['N'] == NULL) return;
+ if (CM_IsEmpty(msg, eAuthor)) return;
+ if (CM_IsEmpty(msg, eNodeName)) return;
snprintf(citadel_address, sizeof citadel_address, "%s @ %s",
- msg->cm_fields['A'], msg->cm_fields['N']);
+ msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
- v = vcard_load(msg->cm_fields['M']);
+ v = vcard_load(msg->cm_fields[eMesageText]);
if (v == NULL) return;
/* Go through the vCard searching for *all* instances of
* and in the global address book).
*/
int vcard_upload_beforesave(struct CtdlMessage *msg) {
- char *ptr;
+ struct CitContext *CCC = CC;
char *s;
char buf[SIZ];
struct ctdluser usbuf;
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 (!CCC->logged_in) return(0); /* Only do this if logged in. */
/* Is this some user's "My Citadel Config" room? */
- if ( (CC->room.QRflags && QR_MAILBOX)
- && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+ if (((CCC->room.QRflags & QR_MAILBOX) != 0) &&
+ (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
/* Yes, we want to do this */
yes_my_citadel_config = 1;
#ifdef VCARD_SAVES_BY_AIDES_ONLY
/* Prevent non-aides from performing registration changes */
- if (CC->user.axlevel < AxAideU) {
+ if (CCC->user.axlevel < AxAideU) {
return(1);
}
#endif
}
/* Is this a room with an address book in it? */
- if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
+ if (CCC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
yes_any_vcard_room = 1;
}
/* Ok, if we got this far, look into the situation further... */
- ptr = msg->cm_fields['M'];
- if (ptr == NULL) return(0);
+ if (CM_IsEmpty(msg, eMesageText)) return(0);
- mime_parser(msg->cm_fields['M'],
+ mime_parser(msg->cm_fields[eMesageText],
NULL,
*vcard_extract_vcard,
NULL, NULL,
if (v == NULL) return(0); /* no vCards were found in this message */
/* If users cannot create their own accounts, they cannot re-register either. */
- if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) {
+ if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CCC->user.axlevel < AxAideU) ) {
return(1);
}
* delete the old one. First, figure out which user
* is being re-registered...
*/
- what_user = atol(CC->room.QRname);
+ what_user = atol(CCC->room.QRname);
- if (what_user == CC->user.usernum) {
+ if (what_user == CCC->user.usernum) {
/* It's the logged in user. That was easy. */
- memcpy(&usbuf, &CC->user, sizeof(struct ctdluser));
+ memcpy(&usbuf, &CCC->user, sizeof(struct ctdluser));
}
else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) {
* vCard in the user's config room at all times.
*
*/
- CtdlDeleteMessages(CC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
+ CtdlDeleteMessages(CCC->room.QRname, NULL, 0, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
/* 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);
+ CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
}
/* Insert or replace RFC2739-compliant free/busy URL */
/* Enforce local UID policy if applicable */
if (yes_my_citadel_config) {
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME);
+ snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME);
vcard_set_prop(v, "UID", 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'] = NULL;
- }
+ CM_FlushField(msg, eExclusiveID);
+
s = vcard_get_prop(v, "UID", 1, 0, 0);
if (s != NULL) {
- msg->cm_fields['E'] = strdup(s);
- if (msg->cm_fields['U'] == NULL) {
- msg->cm_fields['U'] = strdup(s);
+ CM_SetField(msg, eExclusiveID, s, strlen(s));
+ if (CM_IsEmpty(msg, eMsgSubject)) {
+ CM_CopyField(msg, eMsgSubject, eExclusiveID);
}
}
s = vcard_get_prop(v, "N", 1, 0, 0);
}
if (s != NULL) {
- if (msg->cm_fields['U'] != NULL) {
- free(msg->cm_fields['U']);
- }
- msg->cm_fields['U'] = strdup(s);
+ CM_SetField(msg, eMsgSubject, s, strlen(s));
}
/* 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: " VCARD_MIME_TYPE
- "\r\n\r\n%s\r\n", ser);
+ StrBuf *buf;
+ long serlen;
+
+ serlen = strlen(ser);
+ buf = NewStrBufPlain(NULL, serlen + 1024);
+
+ StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
+ StrBufAppendBufPlain(buf, ser, serlen, 0);
+ StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
+ CM_SetAsFieldSB(msg, eMesageText, &buf);
free(ser);
}
* address book).
*/
int vcard_upload_aftersave(struct CtdlMessage *msg) {
+ struct CitContext *CCC = CC;
char *ptr;
int linelen;
long I;
char roomname[ROOMNAMELEN];
if (msg->cm_format_type != 4) return(0);
- if (!CC->logged_in) return(0); /* Only do this if logged in. */
+ if (!CCC->logged_in) return(0); /* Only do this if logged in. */
/* We're interested in user config rooms only. */
- if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
+ if ( (strlen(CCC->room.QRname) >= 12) && (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
is_UserConf = 1; /* It's someone's config room */
}
- CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM);
- if (!strcasecmp(CC->room.QRname, roomname)) {
+ CtdlMailboxName(roomname, sizeof roomname, &CCC->user, USERCONFIGROOM);
+ if (!strcasecmp(CCC->room.QRname, roomname)) {
is_UserConf = 1;
is_MY_UserConf = 1; /* It's MY config room */
}
- if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) {
+ if (!strcasecmp(CCC->room.QRname, ADDRESS_BOOK_ROOM)) {
is_GAB = 1; /* It's the Global Address Book */
}
if (!is_UserConf && !is_GAB) return(0);
- ptr = msg->cm_fields['M'];
- if (ptr == NULL) return(0);
+ if (CM_IsEmpty(msg, eMesageText))
+ return 0;
- NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0);
+ ptr = msg->cm_fields[eMesageText];
- StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS);
+ NewStrBufDupAppendFlush(&CCC->StatusMessage, NULL, NULL, 0);
+
+ StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS);
while (ptr != NULL) {
* copy it to the Global Address Book room.
*/
- I = atol(msg->cm_fields['3']);
+ I = atol(msg->cm_fields[eVltMsgNum]);
if (I <= 0L) return(0);
/* Store our Internet return address in memory */
if (is_MY_UserConf) {
- v = vcard_load(msg->cm_fields['M']);
- extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email,
- CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails,
+ v = vcard_load(msg->cm_fields[eMesageText]);
+ extract_inet_email_addrs(CCC->cs_inet_email, sizeof CCC->cs_inet_email,
+ CCC->cs_inet_other_emails, sizeof CCC->cs_inet_other_emails,
v, 1);
- extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
+ extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v);
vcard_free(v);
}
* But if the user was an Aide or was edited by an Aide then we can
* Assume they don't need validating.
*/
- if (CC->user.axlevel >= AxAideU) {
- CtdlGetUserLock(&CC->user, CC->curr_user);
- CC->user.flags |= US_REGIS;
- CtdlPutUserLock(&CC->user);
+ if (CCC->user.axlevel >= AxAideU) {
+ CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ CCC->user.flags |= US_REGIS;
+ CtdlPutUserLock(&CCC->user);
return (0);
}
set_mm_valid();
/* ...which also means we need to flag the user */
- CtdlGetUserLock(&CC->user, CC->curr_user);
- CC->user.flags |= (US_REGIS|US_NEEDVALID);
- CtdlPutUserLock(&CC->user);
+ CtdlGetUserLock(&CCC->user, CCC->curr_user);
+ CCC->user.flags |= (US_REGIS|US_NEEDVALID);
+ CtdlPutUserLock(&CCC->user);
return(0);
}
* and return an empty vCard.
*/
struct vCard *vcard_get_user(struct ctdluser *u) {
+ struct CitContext *CCC = CC;
char hold_rm[ROOMNAMELEN];
char config_rm[ROOMNAMELEN];
struct CtdlMessage *msg = NULL;
struct vCard *v;
long VCmsgnum;
- strcpy(hold_rm, CC->room.QRname); /* save current room */
+ strcpy(hold_rm, CCC->room.QRname); /* save current room */
CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
- if (CtdlGetRoom(&CC->room, config_rm) != 0) {
- CtdlGetRoom(&CC->room, hold_rm);
+ if (CtdlGetRoom(&CCC->room, config_rm) != 0) {
+ CtdlGetRoom(&CCC->room, hold_rm);
return vcard_new();
}
VCmsgnum = (-1);
CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
NULL, vcard_gu_backend, (void *)&VCmsgnum );
- CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */
+ CtdlGetRoom(&CCC->room, hold_rm); /* return to saved room */
if (VCmsgnum < 0L) return vcard_new();
msg = CtdlFetchMessage(VCmsgnum, 1);
if (msg == NULL) return vcard_new();
- v = vcard_load(msg->cm_fields['M']);
+ v = vcard_load(msg->cm_fields[eMesageText]);
CtdlFreeMessage(msg);
return v;
}
* and enters the vCard into the user's configuration.
*/
void cmd_regi(char *argbuf) {
+ struct CitContext *CCC = CC;
int a,b,c;
char buf[SIZ];
struct vCard *my_vcard;
unbuffer_output();
- if (!(CC->logged_in)) {
+ if (!(CCC->logged_in)) {
cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN);
return;
}
/* If users cannot create their own accounts, they cannot re-register either. */
- if ( (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) {
+ if ( (config.c_disable_newu) && (CCC->user.axlevel < AxAideU) ) {
cprintf("%d Self-service registration is not allowed here.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
}
- my_vcard = vcard_get_user(&CC->user);
+ my_vcard = vcard_get_user(&CCC->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->user, my_vcard);
+ vcard_write_user(&CCC->user, my_vcard);
vcard_free(my_vcard);
}
*/
void cmd_greg(char *argbuf)
{
+ struct CitContext *CCC = CC;
struct ctdluser usbuf;
struct vCard *v;
char *s;
extract_token(who, argbuf, 0, '|', sizeof who);
- if (!(CC->logged_in)) {
+ if (!(CCC->logged_in)) {
cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
return;
}
- if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user);
+ if (!strcasecmp(who,"_SELF_")) strcpy(who,CCC->curr_user);
- if ((CC->user.axlevel < AxAideU) && (strcasecmp(who,CC->curr_user))) {
+ if ((CCC->user.axlevel < AxAideU) && (strcasecmp(who,CCC->curr_user))) {
cprintf("%d Higher access required.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
void vcard_purge(struct ctdluser *usbuf) {
struct CtdlMessage *msg;
char buf[SIZ];
+ long len;
msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
if (msg == NULL) return;
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 0;
- 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");
+ CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname));
+ CM_SetField(msg, eOriginalRoom, HKEY(ADDRESS_BOOK_ROOM));
+ CM_SetField(msg, eNodeName, NODENAME, strlen(NODENAME));
+ CM_SetField(msg, eMesageText, HKEY("Purge this vCard\n"));
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
- msg->cm_fields['A'], NODENAME);
- msg->cm_fields['E'] = strdup(buf);
+ len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+ msg->cm_fields[eAuthor], NODENAME);
+ CM_SetField(msg, eExclusiveID, buf, len);
- msg->cm_fields['S'] = strdup("CANCEL");
+ CM_SetField(msg, eSpecialField, HKEY("CANCEL"));
CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR);
CtdlFreeMessage(msg);
if (msg->cm_format_type != 4) return(0);
- ptr = msg->cm_fields['M'];
- if (ptr == NULL) return(0);
+ if (CM_IsEmpty(msg, eMesageText))
+ return 0;
+
+ ptr = msg->cm_fields[eMesageText];
+
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- ptr = msg->cm_fields['M'];
- if (ptr == NULL) goto EOH;
+ if (CM_IsEmpty(msg, eMesageText))
+ goto EOH;
+
+ ptr = msg->cm_fields[eMesageText];
+
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
if (linelen == 0) goto EOH;
*/
void cmd_gvsn(char *argbuf)
{
+ struct CitContext *CCC = CC;
+
if (CtdlAccessCheck(ac_logged_in)) return;
cprintf("%d valid screen names:\n", LISTING_FOLLOWS);
- cprintf("%s\n", CC->user.fullname);
- if ( (!IsEmptyStr(CC->cs_inet_fn)) && (strcasecmp(CC->user.fullname, CC->cs_inet_fn)) ) {
- cprintf("%s\n", CC->cs_inet_fn);
+ cprintf("%s\n", CCC->user.fullname);
+ if ( (!IsEmptyStr(CCC->cs_inet_fn)) && (strcasecmp(CCC->user.fullname, CCC->cs_inet_fn)) ) {
+ cprintf("%s\n", CCC->cs_inet_fn);
}
cprintf("000\n");
}
*/
void cmd_gvea(char *argbuf)
{
+ struct CitContext *CCC = CC;
int num_secondary_emails = 0;
int i;
char buf[256];
if (CtdlAccessCheck(ac_logged_in)) return;
cprintf("%d valid email addresses:\n", LISTING_FOLLOWS);
- if (!IsEmptyStr(CC->cs_inet_email)) {
- cprintf("%s\n", CC->cs_inet_email);
+ if (!IsEmptyStr(CCC->cs_inet_email)) {
+ cprintf("%s\n", CCC->cs_inet_email);
}
- if (!IsEmptyStr(CC->cs_inet_other_emails)) {
- num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
+ if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
+ num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|');
for (i=0; i<num_secondary_emails; ++i) {
- extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails);
+ extract_token(buf, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails);
cprintf("%s\n", buf);
}
}
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- mime_parser(msg->cm_fields['M'],
+ mime_parser(msg->cm_fields[eMesageText],
NULL,
*dvca_mime_callback, /* callback function */
NULL, NULL,
msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
- v = vcard_load(msg->cm_fields['M']);
+ v = vcard_load(msg->cm_fields[eMesageText]);
CtdlFreeMessage(msg);
i = 0;
striplt(recipient);
v = vcard_new_from_rfc822_addr(recipient);
if (v != NULL) {
+ const char *s;
vmsg = malloc(sizeof(struct CtdlMessage));
memset(vmsg, 0, sizeof(struct CtdlMessage));
vmsg->cm_magic = CTDLMESSAGE_MAGIC;
vmsg->cm_anon_type = MES_NORMAL;
vmsg->cm_format_type = FMT_RFC822;
- vmsg->cm_fields['A'] = strdup("Citadel");
- vmsg->cm_fields['E'] = strdup(vcard_get_prop(v, "UID", 1, 0, 0));
+ CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
+ s = vcard_get_prop(v, "UID", 1, 0, 0);
+ CM_SetField(vmsg, eExclusiveID, s, strlen(s));
ser = vcard_serialize(v);
if (ser != NULL) {
- vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
- sprintf(vmsg->cm_fields['M'],
- "Content-type: " VCARD_MIME_TYPE
- "\r\n\r\n%s\r\n", ser);
+ StrBuf *buf;
+ long serlen;
+
+ serlen = strlen(ser);
+ buf = NewStrBufPlain(NULL, serlen + 1024);
+
+ StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0);
+ StrBufAppendBufPlain(buf, ser, serlen, 0);
+ StrBufAppendBufPlain(buf, HKEY("\r\n"), 0);
+ CM_SetAsFieldSB(vmsg, eMesageText, &buf);
free(ser);
}
vcard_free(v);