From 5d2d3f4eea91c74af93c735bff7ad9955b466181 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 16 Sep 2022 21:20:04 +0000 Subject: [PATCH] Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening brace on the same line as the function declaration causes mk_modules_init.sh to barf its lungs out. --- webcit/addressbook_popup.c | 23 +- webcit/auth.c | 213 +++-- webcit/autocompletion.c | 31 +- webcit/availability.c | 92 ++- webcit/bbsview_renderer.c | 198 +++-- webcit/blogview_renderer.c | 180 ++-- webcit/calendar.c | 351 ++++---- webcit/calendar.h | 63 +- webcit/calendar_tools.c | 118 +-- webcit/calendar_view.c | 826 +++++++++++-------- webcit/context_loop.c | 345 ++++---- webcit/cookie_conversion.c | 24 +- webcit/crypto.c | 27 +- webcit/dav.h | 11 +- webcit/dav_delete.c | 10 +- webcit/dav_get.c | 52 +- webcit/dav_main.c | 161 ++-- webcit/dav_options.c | 32 +- webcit/dav_propfind.c | 577 +++++++------ webcit/dav_put.c | 38 +- webcit/dav_report.c | 46 +- webcit/downloads.c | 252 +++--- webcit/event.c | 578 +++++++------ webcit/feed_generator.c | 71 +- webcit/fmt_date.c | 148 ++-- webcit/gettext.c | 204 +++-- webcit/graphics.c | 47 +- webcit/html2html.c | 377 +++++---- webcit/http_datestring.c | 30 +- webcit/ical_dezonify.c | 63 +- webcit/ical_subst.c | 257 +++--- webcit/iconbar.c | 161 ++-- webcit/icontheme.c | 90 +- webcit/inetconf.c | 84 +- webcit/jsonview_renderer.c | 56 +- webcit/listsub.c | 25 +- webcit/locate_host.c | 10 +- webcit/mailview_renderer.c | 78 +- webcit/mainmenu.c | 42 +- webcit/marchlist.c | 57 +- webcit/messages.c | 702 ++++++++-------- webcit/messages.h | 155 ++-- webcit/msg_renderers.c | 927 ++++++++++++--------- webcit/netconf.c | 120 +-- webcit/notes.c | 176 ++-- webcit/openid.c | 56 +- webcit/paging.c | 37 +- webcit/paramhandling.c | 440 ++++++---- webcit/paramhandling.h | 24 +- webcit/preferences.c | 509 ++++++++---- webcit/preferences.h | 25 +- webcit/pushemail.c | 106 +-- webcit/roomchat.c | 16 +- webcit/roomlist.c | 522 +++++++----- webcit/roomops.c | 570 +++++++------ webcit/roomops.h | 92 +-- webcit/roomtokens.c | 302 ++++--- webcit/roomviews.c | 151 ++-- webcit/serv_func.c | 210 +++-- webcit/sieve.c | 366 +++++---- webcit/siteconfig.c | 349 ++++---- webcit/sitemap.c | 73 +- webcit/smtpqueue.c | 271 +++--- webcit/sockets.c | 409 ++++++---- webcit/sockets.h | 21 +- webcit/static.c | 103 +-- webcit/subst.c | 1585 ++++++++++++++++++++++-------------- webcit/subst.h | 168 ++-- webcit/summary.c | 48 +- webcit/sysdep.c | 208 ++--- webcit/sysmsgs.c | 24 +- webcit/tabs.c | 159 ++-- webcit/tasks.c | 302 ++++--- webcit/useredit.c | 501 +++++++----- webcit/utils.c | 161 ++-- webcit/utils.h | 5 +- webcit/vcard_edit.c | 517 +++++++----- webcit/webcit.c | 312 ++++--- webcit/webcit.h | 326 ++++---- webcit/webserver.c | 85 +- webcit/webserver.h | 9 +- webcit/who.c | 184 +++-- webcit/wiki.c | 103 ++- 83 files changed, 10220 insertions(+), 7257 deletions(-) diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index 097d13a55..afbf3a0c7 100644 --- a/webcit/addressbook_popup.c +++ b/webcit/addressbook_popup.c @@ -1,4 +1,3 @@ - /* * Dynamic HTML (formerly known as "AJAX") powered auto-completion * @@ -19,7 +18,8 @@ /* * Address book popup results */ -HashList *GetAddressbookList() { +HashList* GetAddressbookList() +{ HashList *List = NULL; const StrBuf *WhichAddrBook; StrBuf *saved_roomname; @@ -41,13 +41,19 @@ HashList *GetAddressbookList() { gotoroom(WhichAddrBook); serv_puts("DVCA"); } - + Line = NewStrBuf(); StrBuf_ServGetln(Line); - if (GetServerStatus(Line, NULL) == 1) { + if (GetServerStatus(Line, NULL) == 1) { List = NewHash(1, NULL); - while (BufLen = StrBuf_ServGetln(Line), ((BufLen >= 0) && ((BufLen != 3) || strcmp(ChrPtr(Line), "000")))) { - if (IsLocalAddrBook && (BufLen > 5) && (strncmp(ChrPtr(Line), "SYS_", 4) == 0)) { + while (BufLen = StrBuf_ServGetln(Line), + ((BufLen >= 0) && + ((BufLen != 3) || strcmp(ChrPtr(Line), "000")))) + { + if (IsLocalAddrBook && + (BufLen > 5) && + (strncmp(ChrPtr(Line), "SYS_", 4) == 0)) + { continue; } Name = NewStrBufPlain(NULL, StrLength(Line)); @@ -69,7 +75,10 @@ HashList *GetAddressbookList() { -void InitModule_ADDRBOOK_POPUP(void) { +void +InitModule_ADDRBOOK_POPUP +(void) +{ RegisterIterator("ITERATE:ABNAMES", 0, NULL, GetAddressbookList, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG); } diff --git a/webcit/auth.c b/webcit/auth.c index 790d5429b..74d9237e9 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -1,4 +1,3 @@ - /* * These functions handle authentication of users to a Citadel server. * @@ -17,36 +16,36 @@ #include "webserver.h" #include -extern uint32_t hashlittle(const void *key, size_t length, uint32_t initval); +extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); /* * Access level definitions. This is initialized from a function rather than a * static array so that the strings may be localized. */ -char *axdefs[7]; +char *axdefs[7]; void initialize_axdefs(void) { /* an erased user */ - axdefs[0] = _("Deleted"); + axdefs[0] = _("Deleted"); /* a new user */ - axdefs[1] = _("New User"); + axdefs[1] = _("New User"); /* a trouble maker */ - axdefs[2] = _("Problem User"); + axdefs[2] = _("Problem User"); /* user with normal privileges */ - axdefs[3] = _("Local User"); + axdefs[3] = _("Local User"); /* a user that may access network resources */ - axdefs[4] = _("Network User"); + axdefs[4] = _("Network User"); /* a moderator */ axdefs[5] = _("Preferred User"); /* chief */ - axdefs[6] = _("Admin"); + axdefs[6] = _("Admin"); } @@ -55,7 +54,8 @@ void initialize_axdefs(void) { * Display the login screen * mesg = the error message if last attempt failed. */ -void display_login(void) { +void display_login(void) +{ begin_burst(); output_headers(1, 0, 0, 0, 1, 0); do_template("login"); @@ -78,7 +78,8 @@ void display_login(void) { * pass his password * serv_response The parameters returned from a Citadel USER or NEWU command */ -void become_logged_in(const StrBuf * user, const StrBuf * pass, StrBuf * serv_response) { +void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response) +{ wcsession *WCC = WC; StrBuf *Buf; StrBuf *FloorDiv; @@ -88,8 +89,8 @@ void become_logged_in(const StrBuf * user, const StrBuf * pass, StrBuf * serv_re if (WCC->wc_fullname == NULL) WCC->wc_fullname = NewStrBufPlain(NULL, StrLength(serv_response)); StrBufExtract_token(WCC->wc_fullname, serv_response, 0, '|'); - StrBufCutLeft(WCC->wc_fullname, 4); - + StrBufCutLeft(WCC->wc_fullname, 4 ); + if (WCC->wc_username == NULL) WCC->wc_username = NewStrBufDup(user); else { @@ -118,11 +119,11 @@ void become_logged_in(const StrBuf * user, const StrBuf * pass, StrBuf * serv_re const char *pch; pch = ChrPtr(Buf) + 4; - /*WCC->new_mail = */ StrBufExtractNext_long(Buf, &pch, '|'); + /*WCC->new_mail =*/ StrBufExtractNext_long(Buf, &pch, '|'); WCC->need_regi = StrBufExtractNext_long(Buf, &pch, '|'); WCC->need_vali = StrBufExtractNext_long(Buf, &pch, '|'); if (WCC->cs_inet_email == NULL) - WCC->cs_inet_email = NewStrBuf(); + WCC->cs_inet_email = NewStrBuf(); StrBufExtract_NextToken(WCC->cs_inet_email, Buf, &pch, '|'); } get_preference("floordiv_expanded", &FloorDiv); @@ -181,7 +182,8 @@ void ajax_login_newuser(void) { /* * Try to create an account manually after an OpenID was verified */ -void openid_manual_create(void) { +void openid_manual_create(void) +{ StrBuf *Buf; /* Did the user change his mind? Pack up and go home. */ @@ -219,8 +221,7 @@ void openid_manual_create(void) { do_template("authpopup_finished"); end_burst(); } - } - else { + } else { /* Still no good! Go back to teh dialog to select a username */ const StrBuf *Buf; putbstr("__claimed_id", NewStrBufDup(sbstr("openid_url"))); @@ -242,12 +243,16 @@ void openid_manual_create(void) { * Perform authentication using OpenID * assemble the checkid_setup request and then redirect to the user's identity provider */ -void do_openid_login(void) { +void do_openid_login(void) +{ char buf[4096]; snprintf(buf, sizeof buf, - "OIDS %s|%s/finalize_openid_login|%s", bstr("openid_url"), ChrPtr(site_prefix), ChrPtr(site_prefix) - ); + "OIDS %s|%s/finalize_openid_login|%s", + bstr("openid_url"), + ChrPtr(site_prefix), + ChrPtr(site_prefix) + ); serv_puts(buf); serv_getln(buf, sizeof buf); @@ -270,7 +275,8 @@ void do_openid_login(void) { * Complete the authentication using OpenID * This function handles the positive or negative assertion from the user's Identity Provider */ -void finalize_openid_login(void) { +void finalize_openid_login(void) +{ StrBuf *Buf; wcsession *WCC = WC; int linecount = 0; @@ -292,10 +298,10 @@ void finalize_openid_login(void) { const char *HKey; HashPos *Cursor; int len; - - Cursor = GetNewHashPos(WCC->Hdr->urlstrings, 0); + + Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0); while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) { - u = (urlcontent *) U; + u = (urlcontent*) U; if (!strncasecmp(u->url_key, "openid.", 7)) { serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data)); } @@ -304,9 +310,11 @@ void finalize_openid_login(void) { serv_puts("000"); linecount = 0; - while (len = StrBuf_ServGetln(Buf), ((len >= 0) && ((len != 3) || strcmp(ChrPtr(Buf), "000")))) { - if (linecount == 0) - result = NewStrBufDup(Buf); + while (len = StrBuf_ServGetln(Buf), + ((len >= 0) && + ((len != 3) || strcmp(ChrPtr(Buf), "000") ))) + { + if (linecount == 0) result = NewStrBufDup(Buf); if (!strcasecmp(ChrPtr(result), "authenticate")) { if (linecount == 1) { username = NewStrBufDup(Buf); @@ -336,7 +344,7 @@ void finalize_openid_login(void) { /* * Is this an attempt to associate a new OpenID with an account that is already logged in? */ - if ((WCC->logged_in) && (havebstr("attach_existing"))) { + if ( (WCC->logged_in) && (havebstr("attach_existing")) ) { display_openids(); } @@ -352,8 +360,7 @@ void finalize_openid_login(void) { output_headers(1, 0, 0, 0, 1, 0); do_template("authpopup_finished"); end_burst(); - } - else { + } else { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); wc_printf(""); @@ -409,7 +416,7 @@ void do_welcome(void) { * Go to the user's preferred start page */ if (!get_preference("startpage", &Buf)) { - Buf = NewStrBuf(); + Buf = NewStrBuf (); StrBufPrintf(Buf, "dotskip?room=_BASEROOM_"); set_preference("startpage", Buf, 1); } @@ -437,7 +444,8 @@ void end_webcit_session(void) { /* * Log out the session with the Citadel server */ -void do_logout(void) { +void do_logout(void) +{ wcsession *WCC = WC; char buf[SIZ]; @@ -468,14 +476,19 @@ void do_logout(void) { /* * Special page for monitoring scripts etc */ -void monitor(void) { +void monitor(void) +{ output_headers(0, 0, 0, 0, 0, 0); - hprintf("Content-type: text/plain\r\n" "Server: " PACKAGE_STRING "\r\n" "Connection: close\r\n"); + hprintf("Content-type: text/plain\r\n" + "Server: " PACKAGE_STRING "\r\n" + "Connection: close\r\n" + ); begin_burst(); - wc_printf("Connection to Citadel server in %s : %s\r\n", ctdl_dir, (WC->connected ? "SUCCESS" : "FAIL") - ); + wc_printf("Connection to Citadel server in %s : %s\r\n", ctdl_dir, + (WC->connected ? "SUCCESS" : "FAIL") + ); wDumpContent(0); } @@ -484,7 +497,8 @@ void monitor(void) { /* * validate new users */ -void validate(void) { +void validate(void) +{ char cmd[SIZ]; char user[SIZ]; char buf[SIZ]; @@ -492,9 +506,9 @@ void validate(void) { output_headers(1, 1, 1, 0, 0, 0); - do_template("box_begin_1"); - StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0); - do_template("box_begin_2"); + do_template("box_begin_1"); + StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0); + do_template("box_begin_2"); /* If the user just submitted a validation, process it... */ safestrncpy(buf, bstr("user"), sizeof buf); @@ -536,7 +550,8 @@ void validate(void) { serv_getln(buf, sizeof buf); ++a; if (a == 1) - wc_printf("#%s

%s

", buf, &cmd[4]); + wc_printf("#%s

%s

", + buf, &cmd[4]); if (a == 2) { char *pch; int haveChar = 0; @@ -544,18 +559,23 @@ void validate(void) { int haveOther = 0; int haveLong = 0; pch = buf; - while (!IsEmptyStr(pch)) { + while (!IsEmptyStr(pch)) + { if (isdigit(*pch)) haveNum = 1; else if (isalpha(*pch)) haveChar = 1; else haveOther = 1; - pch++; + pch ++; } if (pch - buf > 7) haveLong = 1; - switch (haveLong + haveChar + haveNum + haveOther) { + switch (haveLong + + haveChar + + haveNum + + haveOther) + { case 0: pch = _("very weak"); break; @@ -585,10 +605,10 @@ void validate(void) { if (a == 8) wc_printf("%s
\n", buf); if (a == 9) - wc_printf(_("Current access level: %d (%s)\n"), atoi(buf), axdefs[atoi(buf)]); + wc_printf(_("Current access level: %d (%s)\n"), + atoi(buf), axdefs[atoi(buf)]); } while (strcmp(buf, "000")); - } - else { + } else { wc_printf("

%s

%s
\n", user, &cmd[4]); } @@ -598,7 +618,8 @@ void validate(void) { for (a = 0; a <= 6; ++a) { wc_printf("nonce); urlescputs(user); - wc_printf("&axlevel=%d\">%s   \n", a, axdefs[a]); + wc_printf("&axlevel=%d\">%s   \n", + a, axdefs[a]); } wc_printf("
\n"); @@ -615,7 +636,8 @@ void validate(void) { * (Set during_login to 1 if this registration is being performed during * new user login and will require chaining to the proper screen.) */ -void display_reg(int during_login) { +void display_reg(int during_login) +{ folder Room; StrBuf *Buf; message_summary *VCMsg = NULL; @@ -633,7 +655,7 @@ void display_reg(int during_login) { display_main_menu(); } FreeStrBuf(&Buf); - FlushFolder(&Room); + FlushFolder(&Room); return; } FlushFolder(&Room); @@ -668,7 +690,8 @@ void display_reg(int during_login) { * change password * if passwords match, propagate it to citserver. */ -void changepw(void) { +void changepw(void) +{ StrBuf *Line; char newpass1[32], newpass2[32]; @@ -698,10 +721,14 @@ void changepw(void) { StrBuf_ServGetln(Line); if (GetServerStatusMsg(Line, NULL, 1, 0) == 2) { if (WC->wc_password == NULL) - WC->wc_password = NewStrBufPlain(ChrPtr(Line) + 4, StrLength(Line) - 4); + WC->wc_password = NewStrBufPlain( + ChrPtr(Line) + 4, + StrLength(Line) - 4); else { FlushStrBuf(WC->wc_password); - StrBufAppendBufPlain(WC->wc_password, ChrPtr(Line) + 4, StrLength(Line) - 4, 0); + StrBufAppendBufPlain(WC->wc_password, + ChrPtr(Line) + 4, + StrLength(Line) - 4, 0); } display_main_menu(); } @@ -712,8 +739,9 @@ void changepw(void) { } -int ConditionalHaveAccessCreateRoom(StrBuf * Target, WCTemplputParams * TP) { - StrBuf *Buf; +int ConditionalHaveAccessCreateRoom(StrBuf *Target, WCTemplputParams *TP) +{ + StrBuf *Buf; Buf = NewStrBuf(); serv_puts("CRE8 0"); @@ -730,13 +758,15 @@ int ConditionalHaveAccessCreateRoom(StrBuf * Target, WCTemplputParams * TP) { } -int ConditionalAide(StrBuf * Target, WCTemplputParams * TP) { +int ConditionalAide(StrBuf *Target, WCTemplputParams *TP) +{ wcsession *WCC = WC; - return (WCC != NULL) ? ((WCC->logged_in == 0) || (WC->is_aide == 0)) : 0; + return (WCC != NULL) ? ((WCC->logged_in == 0)||(WC->is_aide == 0)) : 0; } -int ConditionalIsLoggedIn(StrBuf * Target, WCTemplputParams * TP) { +int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP) +{ wcsession *WCC = WC; return (WCC != NULL) ? (WCC->logged_in == 0) : 0; @@ -757,22 +787,24 @@ void _display_reg(void) { } -void Header_HandleAuth(StrBuf * Line, ParsedHttpHdrs * hdr) { - if (hdr->HR.got_auth == NO_AUTH) { /* don't override cookie auth... */ +void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr) +{ + if (hdr->HR.got_auth == NO_AUTH) /* don't override cookie auth... */ + { if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) { StrBufCutLeft(Line, 6); StrBufDecodeBase64(Line); hdr->HR.plainauth = Line; hdr->HR.got_auth = AUTH_BASIC; } - else + else syslog(LOG_WARNING, "Authentication scheme not supported! [%s]\n", ChrPtr(Line)); } } -void CheckAuthBasic(ParsedHttpHdrs * hdr) { - +void CheckAuthBasic(ParsedHttpHdrs *hdr) +{ /* todo: enable this if we can have other sessions than authenticated ones. if (hdr->DontNeedAuth) @@ -783,7 +815,8 @@ void CheckAuthBasic(ParsedHttpHdrs * hdr) { } -void GetAuthBasic(ParsedHttpHdrs * hdr) { +void GetAuthBasic(ParsedHttpHdrs *hdr) +{ const char *Pos = NULL; if (hdr->c_username == NULL) hdr->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER)); @@ -794,9 +827,9 @@ void GetAuthBasic(ParsedHttpHdrs * hdr) { } -void Header_HandleCookie(StrBuf * Line, ParsedHttpHdrs * hdr) { +void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr) +{ const char *pch; - /* todo: enable this if we can have other sessions than authenticated ones. if (hdr->DontNeedAuth) @@ -811,12 +844,20 @@ void Header_HandleCookie(StrBuf * Line, ParsedHttpHdrs * hdr) { StrBufCutLeft(hdr->HR.RawCookie, (pch - ChrPtr(hdr->HR.RawCookie)) + 7); StrBufDecodeHex(hdr->HR.RawCookie); - cookie_to_stuff(Line, &hdr->HR.desired_session, hdr->c_username, hdr->c_password, hdr->c_roomname, hdr->c_language); + cookie_to_stuff(Line, &hdr->HR.desired_session, + hdr->c_username, + hdr->c_password, + hdr->c_roomname, + hdr->c_language + ); hdr->HR.got_auth = AUTH_COOKIE; } -void HttpNewModule_AUTH(ParsedHttpHdrs * httpreq) { +void +HttpNewModule_AUTH +(ParsedHttpHdrs *httpreq) +{ httpreq->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER)); httpreq->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS)); httpreq->c_roomname = NewStrBuf(); @@ -824,7 +865,10 @@ void HttpNewModule_AUTH(ParsedHttpHdrs * httpreq) { } -void HttpDetachModule_AUTH(ParsedHttpHdrs * httpreq) { +void +HttpDetachModule_AUTH +(ParsedHttpHdrs *httpreq) +{ FLUSHStrBuf(httpreq->c_username); FLUSHStrBuf(httpreq->c_password); FLUSHStrBuf(httpreq->c_roomname); @@ -832,7 +876,10 @@ void HttpDetachModule_AUTH(ParsedHttpHdrs * httpreq) { } -void HttpDestroyModule_AUTH(ParsedHttpHdrs * httpreq) { +void +HttpDestroyModule_AUTH +(ParsedHttpHdrs *httpreq) +{ FreeStrBuf(&httpreq->c_username); FreeStrBuf(&httpreq->c_password); FreeStrBuf(&httpreq->c_roomname); @@ -840,15 +887,18 @@ void HttpDestroyModule_AUTH(ParsedHttpHdrs * httpreq) { } -void InitModule_AUTH(void) { +void +InitModule_AUTH +(void) +{ initialize_axdefs(); RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie); RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth); /* no url pattern at all? Show login. */ - WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS | COOKIEUNNEEDED); + WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); - WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS | COOKIEUNNEEDED); + WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS); WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS); WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS); @@ -857,19 +907,22 @@ void InitModule_AUTH(void) { WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0); WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0); WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0); - WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS | COOKIEUNNEEDED | FORCE_SESSIONCLOSE); - WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS | COOKIEUNNEEDED | FORCE_SESSIONCLOSE); - WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX | ANONYMOUS); - WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX | ANONYMOUS); + WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE); + WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS); + WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX|ANONYMOUS); WebcitAddUrlHandler(HKEY("switch_language"), "", 0, switch_language, ANONYMOUS); RegisterConditional("COND:AIDE", 2, ConditionalAide, CTX_NONE); RegisterConditional("COND:LOGGEDIN", 2, ConditionalIsLoggedIn, CTX_NONE); - RegisterConditional("COND:MAY_CREATE_ROOM", 2, ConditionalHaveAccessCreateRoom, CTX_NONE); + RegisterConditional("COND:MAY_CREATE_ROOM", 2, ConditionalHaveAccessCreateRoom, CTX_NONE); return; } -void SessionDestroyModule_AUTH(wcsession * sess) { +void +SessionDestroyModule_AUTH +(wcsession *sess) +{ FreeStrBuf(&sess->wc_username); FreeStrBuf(&sess->wc_fullname); FreeStrBuf(&sess->wc_password); diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c index 95948c60f..e936068fd 100644 --- a/webcit/autocompletion.c +++ b/webcit/autocompletion.c @@ -1,4 +1,3 @@ - /* * dynamic html autocompletion * @@ -26,7 +25,12 @@ void recp_autocomplete(char *partial) { hprintf("Content-type: text/html\r\n" "Server: %s\r\n" - "Connection: close\r\n" "Pragma: no-cache\r\n" "Cache-Control: no-store\r\n" "Expires: -1\r\n", PACKAGE_STRING); + "Connection: close\r\n" + "Pragma: no-cache\r\n" + "Cache-Control: no-store\r\n" + "Expires: -1\r\n" + , + PACKAGE_STRING); begin_burst(); wc_printf("