final touches on dkim test harness

[citadel.git] / webcit / useredit.c

diff --git a/webcit/useredit.c b/webcit/useredit.c
index e1fb110ff4e2b3ca774c71339e01cf73a85da005..ce94a343dc508b8e41353677c7a7068599b44d85 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2020 by the citadel.org team
+ * Copyright (c) 1996-2021 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.
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_USERLIST = CTX_NONE;
 /*
@@ -529,7 +529,6 @@ int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP)
  */
 long locate_user_vcard_in_this_room(message_summary **VCMsg, wc_mime_attachment **VCAtt)
 {
-       wcsession *WCC = WC;
        HashPos *at;
        HashPos *att;
        const char *HashKey;
@@ -553,8 +552,8 @@ TRYAGAIN:
        Stat.highest_found = (-1);
        /* Search for the user's vCard */
        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)) {
+               at = GetNewHashPos(WC->summ, 0);
+               while (GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) {
                        Msg = (message_summary*) vMsg;          
                        Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
                        memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
@@ -801,7 +800,7 @@ void edituser(void) {
                }
 
                /* Remove any naughty inappropriate whitespace */
-               striplt(all_the_emails);
+               string_trim(all_the_emails);
                while (pos = strstr(all_the_emails, "\n,"), (pos != NULL)) {
                        strcpy(pos, pos+1);
                }