/*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-2020 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
#include "webserver.h"
-
+CtxType CTX_USERLIST = CTX_NONE;
/*
* show a list of available users to edit them
* message the header message???
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, '|');
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
Hash = NewHash(1, Flathash);
-
+ Done = 0;
while (!Done) {
len = StrBuf_ServGetln(Buf);
if ((len <0) ||
serv_puts("LBIO 1");
StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) == 1)
+ if (GetServerStatus(Buf, NULL) == 1) {
Done = 0;
while (!Done) {
- len = StrBuf_ServGetln(Buf);
- if ((len <0) ||
- ((len == 3) &&
- !strcmp(ChrPtr(Buf), "000")))
- {
- Done = 1;
- break;
+ len = StrBuf_ServGetln(Buf);
+ if ((len <0) || ((len == 3) && !strcmp(ChrPtr(Buf), "000")))
+ {
+ Done = 1;
+ break;
+ }
}
UID = atoi(ChrPtr(Buf));
if (GetHash(Hash, IKEY(UID), &vData) && vData != 0)
void tmplput_USERLIST_UserName(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendTemplate(Target, TP, ul->UserName, 0);
}
void tmplput_USERLIST_Password(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
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;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->AccessLevel, 0);
}
void tmplput_USERLIST_AccessLevelStr(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendBufPlain(Target, _(axdefs[ul->AccessLevel]), -1, 0);
}
void tmplput_USERLIST_UID(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->UID, 0);
}
+
void tmplput_USERLIST_LastLogonNo(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target,"%ld", ul->LastLogonT, 0);
}
+
+
void tmplput_USERLIST_LastLogonStr(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrEscAppend(Target, NULL, asctime(localtime(&ul->LastLogonT)), 0, 0);
}
+
void tmplput_USERLIST_nLogons(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->nLogons, 0);
}
+
void tmplput_USERLIST_nPosts(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->nPosts, 0);
}
+
void tmplput_USERLIST_Flags(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->Flags, 0);
}
+
void tmplput_USERLIST_DaysTillPurge(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
StrBufAppendPrintf(Target, "%d", ul->DaysTillPurge, 0);
}
+
int ConditionalUser(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
if (havebstr("usernum")) {
return ibstr("usernum") == ul->UID;
}
return 0;
}
+
int ConditionalFlagINetEmail(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
return (ul->Flags & US_INTERNET) != 0;
}
+
int ConditionalUserAccess(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
if (ul == NULL)
return 0;
==
ul->AccessLevel;
}
+
+
int ConditionalHaveBIO(StrBuf *Target, WCTemplputParams *TP)
{
- UserListEntry *ul = (UserListEntry*) CTX;
+ UserListEntry *ul = (UserListEntry*) CTX(CTX_USERLIST);
if (ul == NULL)
return 0;
return ul->HasBio;
}
+
+int ConditionalSuppressEmailFields(StrBuf *Target, WCTemplputParams *TP)
+{
+ return 0; // FIXME this makes all email fields display
+}
+
+
void tmplput_USER_BIO(StrBuf *Target, WCTemplputParams *TP)
{
int Done = 0;
long len;
GetTemplateTokenString(Target, TP, 0, &who, &len);
+ if (len == 0) {
+ who = ChrPtr(WC->wc_fullname);
+ }
Buf = NewStrBuf();
serv_printf("RBIO %s", who);
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000"))
Done = 1;
- else
+ else {
StrBufAppendBuf(BioBuf, Buf, 0);
+ StrBufAppendBufPlain(BioBuf, HKEY("\n"), 0);
+ }
}
StrBufAppendTemplate(Target, TP, BioBuf, 1);
FreeStrBuf(&BioBuf);
FreeStrBuf(&Buf);
}
+
int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP)
{
- StrBuf *Buf;
- const char *who;
- long len;
-
- GetTemplateTokenString(Target, TP, 2, &who, &len);
-
- Buf = NewStrBuf();
- serv_printf("OIMG _userpic_|%s", who);
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) != 2) {
- serv_puts("CLOS");
- StrBuf_ServGetln(Buf);
- GetServerStatus(Buf, NULL);
- FreeStrBuf(&Buf);
- return 1;
- } else {
- FreeStrBuf(&Buf);
- return 0;
- }
+ // ajc 2016apr10 this needs to be re-evaluated with the new protocol
+ return(0);
}
Stat.lowest_found = (-1);
Stat.highest_found = (-1);
/* Search for the user's vCard */
- if (load_msg_ptrs("MSGS ALL||||1", &Stat, NULL) > 0) {
+ if (load_msg_ptrs("MSGS ALL||||1", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0) > 0) {
at = GetNewHashPos(WCC->summ, 0);
while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
Msg = (message_summary*) vMsg;
serv_puts("000");
}
else
- syslog(1, "Error while creating user vcard: %s\n", ChrPtr(Buf));
+ syslog(LOG_WARNING, "Error while creating user vcard: %s\n", ChrPtr(Buf));
goto TRYAGAIN;
}
FreeStrBuf(&Buf);
}
/*
- * burge a user
+ * purge a user
* username the name of the user to remove
*/
void delete_user(char *username) {
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);
}
}
-
/*
- * create a new user
- * take the web environment username and create it on the citadel server
+ * create a new user
+ * (take the web environment username and create it on the citadel server)
*/
void create_user(void) {
long FullState;
}
+void display_userpic(void) {
+ off_t bytes;
+ StrBuf *Buf = NewStrBuf();
+ const char *username = bstr("user");
+ serv_printf("DLUI %s", username);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+ StrBuf *content_type = NewStrBuf();
+ StrBufExtract_token(content_type, Buf, 3, '|');
+ WC->WBuf = NewStrBuf();
+ StrBuf_ServGetBLOBBuffered(WC->WBuf, bytes);
+ http_transmit_thing(ChrPtr(content_type), 0);
+ FreeStrBuf(&content_type);
+ }
+ else {
+ output_error_pic("", "");
+ }
+ FreeStrBuf(&Buf);
+}
+
+
void _select_user_to_edit(void) {
select_user_to_edit(NULL);
}
display_edituser(NULL, 0);
}
-void showuser(void)
-{
- output_headers(1, 0, 0, 0, 1, 0);
- do_template("user_show");
- end_burst();
-}
-
void
InitModule_USEREDIT
(void)
{
- WebcitAddUrlHandler(HKEY("showuser"), "", 0, showuser, 0);
+ RegisterCTX(CTX_USERLIST);
WebcitAddUrlHandler(HKEY("select_user_to_edit"), "", 0, _select_user_to_edit, 0);
WebcitAddUrlHandler(HKEY("display_edituser"), "", 0, _display_edituser, 0);
WebcitAddUrlHandler(HKEY("edituser"), "", 0, edituser, 0);
WebcitAddUrlHandler(HKEY("create_user"), "", 0, create_user, 0);
+ WebcitAddUrlHandler(HKEY("userpic"), "", 0, display_userpic, 0);
RegisterNamespace("USERLIST:USERNAME", 0, 1, tmplput_USERLIST_UserName, NULL, CTX_USERLIST);
RegisterNamespace("USERLIST:PASSWD", 0, 1, tmplput_USERLIST_Password, NULL, CTX_USERLIST);
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);
RegisterNamespace("USER:BIO", 1, 2, tmplput_USER_BIO, NULL, CTX_NONE);
- RegisterConditional(HKEY("COND:USERNAME"), 0, ConditionalUser, CTX_USERLIST);
- RegisterConditional(HKEY("COND:USERACCESS"), 0, ConditionalUserAccess, CTX_USERLIST);
- RegisterConditional(HKEY("COND:USERLIST:FLAG:USE_INTERNET"), 0, ConditionalFlagINetEmail, CTX_USERLIST);
- RegisterConditional(HKEY("COND:USERLIST:HAVEBIO"), 0, ConditionalHaveBIO, CTX_USERLIST);
-
- RegisterConditional(HKEY("COND:USER:PIC"), 1, Conditional_USER_HAS_PIC, CTX_NONE);
+ RegisterConditional("COND:USERNAME", 0, ConditionalUser, CTX_USERLIST);
+ RegisterConditional("COND:USERACCESS", 0, ConditionalUserAccess, CTX_USERLIST);
+ RegisterConditional("COND:USERLIST:FLAG:USE_INTERNET", 0, ConditionalFlagINetEmail, CTX_USERLIST);
+ RegisterConditional("COND:USERLIST:HAVEBIO", 0, ConditionalHaveBIO, CTX_USERLIST);
+ RegisterConditional("COND:USER:PIC", 1, Conditional_USER_HAS_PIC, CTX_NONE);
RegisterIterator("USERLIST", 0, NULL, iterate_load_userlist, NULL, DeleteHash, CTX_USERLIST, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
-
-
RegisterSortFunc(HKEY("user:name"),
HKEY("userlist"),
projects / citadel.git / blobdiff