/*
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2017 by the citadel.org team
*
* This program is open source software. You can redistribute it and/or
* modify it under the terms of the GNU General Public License, version 3.
unsigned int Flags;
int DaysTillPurge;
int HasBio;
+
+ StrBuf *PrimaryEmail;
+ StrBuf *OtherEmails;
+
} UserListEntry;
ul = (UserListEntry*) malloc(sizeof(UserListEntry));
ul->UserName = NewStrBuf();
ul->Passvoid = NewStrBuf();
+ ul->PrimaryEmail = NewStrBuf();
+ ul->OtherEmails = NewStrBuf();
StrBufExtract_NextToken(ul->UserName, SerializedUser, &Pos, '|');
StrBufExtract_NextToken(ul->Passvoid, SerializedUser, &Pos, '|');
if (!ul) return;
FreeStrBuf(&ul->UserName);
FreeStrBuf(&ul->Passvoid);
+ FreeStrBuf(&ul->PrimaryEmail);
+ FreeStrBuf(&ul->OtherEmails);
free(ul);
}
ul = (UserListEntry*) malloc(sizeof(UserListEntry));
ul->UserName = NewStrBuf();
ul->Passvoid = NewStrBuf();
+ ul->PrimaryEmail = NewStrBuf();
+ ul->OtherEmails = NewStrBuf();
StrBufExtract_NextToken(ul->UserName, SerializedUserList, &Pos, '|');
ul->AccessLevel = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
Done = 0;
while (!Done) {
len = StrBuf_ServGetln(Buf);
- if ((len <0) ||
- ((len == 3) &&
- !strcmp(ChrPtr(Buf), "000")))
+ if ((len <0) || ((len == 3) && !strcmp(ChrPtr(Buf), "000")))
{
Done = 1;
break;
StrBufAppendTemplate(Target, TP, ul->Passvoid, 0);
}
+void tmplput_USERLIST_PrimaryEmail(StrBuf *Target, WCTemplputParams *TP)
+{
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
+ StrBufAppendTemplate(Target, TP, ul->PrimaryEmail, 0);
+}
+
+void tmplput_USERLIST_OtherEmails(StrBuf *Target, WCTemplputParams *TP)
+{
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
+ StrBufAppendTemplate(Target, TP, ul->OtherEmails, 0);
+}
+
void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, WCTemplputParams *TP)
{
UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
UserListEntry* UL;
StrBuf *Buf;
char username[256];
+ int i = 0;
if (supplied_username != NULL) {
safestrncpy(username, supplied_username, sizeof username);
delete_user(username);
}
else if (UL != NULL) {
+
+ serv_printf("AGEA %s", username);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatusMsg(Buf, NULL, 1, 2) == 1) {
+ while(StrBuf_ServGetln(Buf) , strcmp(ChrPtr(Buf), "000")) {
+ if (i == 0) {
+ StrBufAppendPrintf(UL->PrimaryEmail, "%s", ChrPtr(Buf));
+ }
+ if (i > 1) {
+ StrBufAppendPrintf(UL->OtherEmails, ",");
+ }
+ if (i > 0) {
+ StrBufAppendPrintf(UL->OtherEmails, "%s", ChrPtr(Buf));
+ }
+ ++i;
+ }
+ }
+
WCTemplputParams SubTP;
memset(&SubTP, 0, sizeof(WCTemplputParams));
SubTP.Filter.ContextType = CTX_USERLIST;
}
}
+ /* Send the new account parameters */
serv_printf("ASUP %s|%s|%d|%s|%s|%s|%s|%s|%s|",
username,
bstr("password"),
);
StrBuf_ServGetln(Buf);
GetServerStatusMsg(Buf, NULL, 1, 2);
+
+ /* Send the new email addresses. First make up a delimited list... */
+ char all_the_emails[512];
+ snprintf(all_the_emails, sizeof all_the_emails, "%s,%s", bstr("primaryemail"), bstr("otheremails"));
+
+ /* Replace any commas, semicolons, or spaces with newlines */
+ char *pos;
+ for (pos=all_the_emails; *pos!=0; ++pos) {
+ if ((*pos == ',') || (*pos == ';') || (*pos == ' ')) *pos = '\n' ;
+ }
+
+ /* Remove any naughty inappropriate whitespace */
+ striplt(all_the_emails);
+ while (pos = strstr(all_the_emails, "\n,"), (pos != NULL)) {
+ strcpy(pos, pos+1);
+ }
+ while (pos = strstr(all_the_emails, ",\n"), (pos != NULL)) {
+ strcpy(pos+1, pos+2);
+ }
+ while (pos = strstr(all_the_emails, "\n\n"), (pos != NULL)) {
+ strcpy(pos+1, pos+2);
+ }
+
+ /* Now send it to the server. */
+ serv_printf("ASEA %s", username);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatusMsg(Buf, NULL, 1, 2) == 4) {
+ serv_printf("%s\n000", all_the_emails);
+ }
+
FreeStrBuf(&Buf);
}
RegisterNamespace("USERLIST:LASTLOGON:NO", 0, 0, tmplput_USERLIST_LastLogonNo, NULL, CTX_USERLIST);
RegisterNamespace("USERLIST:NLOGONS", 0, 0, tmplput_USERLIST_nLogons, NULL, CTX_USERLIST);
RegisterNamespace("USERLIST:NPOSTS", 0, 0, tmplput_USERLIST_nPosts, NULL, CTX_USERLIST);
-
+ RegisterNamespace("USERLIST:PRIMARYEMAIL", 0, 1, tmplput_USERLIST_PrimaryEmail, NULL, CTX_USERLIST);
+ RegisterNamespace("USERLIST:OTHEREMAILS", 0, 1, tmplput_USERLIST_OtherEmails, NULL, CTX_USERLIST);
RegisterNamespace("USERLIST:FLAGS", 0, 0, tmplput_USERLIST_Flags, NULL, CTX_USERLIST);
RegisterNamespace("USERLIST:DAYSTILLPURGE", 0, 0, tmplput_USERLIST_DaysTillPurge, NULL, CTX_USERLIST);