X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fuseredit.c;h=a6b4d4b44df152eb836e8acc4d06ee6a04e4cb2a;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=2751ecde955b70c7fe6d54c2d065fb1f422f13d7;hpb=98262c0aab1a46d19a5f52a3bf96146c4ae02cc9;p=citadel.git diff --git a/webcit/useredit.c b/webcit/useredit.c index 2751ecde9..a6b4d4b44 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -1,5 +1,5 @@ /* - * 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. @@ -40,6 +40,10 @@ typedef struct _UserListEntry { unsigned int Flags; int DaysTillPurge; int HasBio; + + StrBuf *PrimaryEmail; + StrBuf *OtherEmails; + } UserListEntry; @@ -53,6 +57,8 @@ UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser, const char *Pos) 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, '|'); @@ -72,6 +78,8 @@ void DeleteUserListEntry(void *vUserList) if (!ul) return; FreeStrBuf(&ul->UserName); FreeStrBuf(&ul->Passvoid); + FreeStrBuf(&ul->PrimaryEmail); + FreeStrBuf(&ul->OtherEmails); free(ul); } @@ -86,6 +94,8 @@ UserListEntry* NewUserListEntry(StrBuf *SerializedUserList) 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, '|'); @@ -279,7 +289,7 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP) StrBuf_ServGetln(Buf); if (GetServerStatus(Buf, NULL) == 1) { Hash = NewHash(1, Flathash); - + Done = 0; while (!Done) { len = StrBuf_ServGetln(Buf); if ((len <0) || @@ -298,16 +308,15 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP) 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) @@ -340,6 +349,18 @@ void tmplput_USERLIST_Password(StrBuf *Target, WCTemplputParams *TP) 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); @@ -475,29 +496,11 @@ void tmplput_USER_BIO(StrBuf *Target, WCTemplputParams *TP) FreeStrBuf(&Buf); } + int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP) { - StrBuf *Buf; - const char *who; - long len; - int r = 0; - - GetTemplateTokenString(Target, TP, 2, &who, &len); - - Buf = NewStrBuf(); - serv_printf("OIMG _userpic_|%s", who); - StrBuf_ServGetln(Buf); - if (GetServerStatus(Buf, NULL) != 2) { - r = 1; - } - else { - r = 0; - } - serv_puts("CLOS"); - StrBuf_ServGetln(Buf); - GetServerStatus(Buf, NULL); - FreeStrBuf(&Buf); - return(r); + // ajc 2016apr10 this needs to be re-evaluated with the new protocol + return(0); } @@ -661,6 +664,7 @@ void display_edituser(const char *supplied_username, int is_new) { UserListEntry* UL; StrBuf *Buf; char username[256]; + int i = 0; if (supplied_username != NULL) { safestrncpy(username, supplied_username, sizeof username); @@ -687,6 +691,24 @@ void display_edituser(const char *supplied_username, int is_new) { 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; @@ -734,6 +756,7 @@ void edituser(void) { } } + /* Send the new account parameters */ serv_printf("ASUP %s|%s|%d|%s|%s|%s|%s|%s|%s|", username, bstr("password"), @@ -747,6 +770,36 @@ void edituser(void) { ); 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); } @@ -796,6 +849,29 @@ void create_user(void) { } +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); } @@ -814,6 +890,7 @@ InitModule_USEREDIT 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); @@ -824,7 +901,8 @@ InitModule_USEREDIT 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);