");
- wc_printf("
");
- wc_printf("
");
- wc_printf(_("Log off"));
- wc_printf("
");
- serv_puts("MESG goodbye");
- serv_getln(buf, sizeof buf);
-
- if (WCC->serv_sock >= 0) {
- if (buf[0] == '1') {
- fmout("'CENTER'");
- } else {
- wc_printf("Goodbye\n");
- }
- }
- else {
- wc_printf(_("This program was unable to connect or stay "
- "connected to the Citadel server. Please report "
- "this problem to your system administrator.")
- );
- wc_printf("
%s",
- _("Read More..."));
- }
-
- wc_printf("
\n");
- if (WC->serv_info->serv_supports_guest) {
+ do_template("logout");
+ if ((WCC->serv_info != NULL) && WCC->serv_info->serv_supports_guest) {
display_default_landing_page();
return;
}
@@ -565,8 +485,7 @@ void monitor(void)
);
begin_burst();
- wc_printf("Connection to Citadel server at %s:%s : %s\r\n",
- ctdlhost, ctdlport,
+ wc_printf("Connection to Citadel server in %s : %s\r\n", ctdl_dir,
(WC->connected ? "SUCCESS" : "FAIL")
);
@@ -727,7 +646,7 @@ void display_reg(int during_login)
Buf = NewStrBuf();
memset(&Room, 0, sizeof(folder));
if (goto_config_room(Buf, &Room) != 0) {
- syslog(9, "display_reg() exiting because goto_config_room() failed\n");
+ syslog(LOG_WARNING, "display_reg() exiting because goto_config_room() failed\n");
if (during_login) {
pop_destination();
}
@@ -743,7 +662,7 @@ void display_reg(int during_login)
FreeStrBuf(&Buf);
vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
if (vcard_msgnum < 0L) {
- syslog(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
+ syslog(LOG_WARNING, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
if (during_login) {
pop_destination();
}
@@ -766,62 +685,6 @@ void display_reg(int during_login)
}
-
-/*
- * display form for changing your password
- */
-void display_changepw(void)
-{
- wcsession *WCC = WC;
- WCTemplputParams SubTP;
- char buf[SIZ];
- StrBuf *Buf;
- output_headers(1, 1, 1, 0, 0, 0);
-
- Buf = NewStrBufPlain(_("Change your password"), -1);
- memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.Filter.ContextType = CTX_STRBUF;
- SubTP.Context = Buf;
- DoTemplate(HKEY("box_begin"), NULL, &SubTP);
-
- FreeStrBuf(&Buf);
-
- if (StrLength(WCC->ImportantMsg) > 0) {
- wc_printf("
"
- "%s\n", ChrPtr(WCC->ImportantMsg));
- FlushStrBuf(WCC->ImportantMsg);
- }
-
- serv_puts("MESG changepw");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '1') {
- fmout("CENTER");
- }
-
- wc_printf("
\n");
-
- do_template("box_end");
- wDumpContent(1);
-}
-
/*
* change password
* if passwords match, propagate it to citserver.
@@ -842,13 +705,13 @@ void changepw(void)
if (strcasecmp(newpass1, newpass2)) {
AppendImportantMessage(_("They don't match. Password was not changed."), -1);
- display_changepw();
+ do_template("menu_change_pw");
return;
}
if (IsEmptyStr(newpass1)) {
AppendImportantMessage(_("Blank passwords are not allowed."), -1);
- display_changepw();
+ do_template("menu_change_pw");
return;
}
@@ -869,7 +732,7 @@ void changepw(void)
display_main_menu();
}
else {
- display_changepw();
+ do_template("menu_change_pw");
}
FreeStrBuf(&Line);
}
@@ -934,7 +797,7 @@ void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr)
hdr->HR.got_auth = AUTH_BASIC;
}
else
- syslog(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+ syslog(LOG_WARNING, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
}
}
@@ -1041,7 +904,6 @@ InitModule_AUTH
WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, 0);
WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
- WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 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);
@@ -1049,9 +911,9 @@ InitModule_AUTH
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(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
- RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);
- RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2, ConditionalHaveAccessCreateRoom, CTX_NONE);
+ RegisterConditional("COND:AIDE", 2, ConditionalAide, CTX_NONE);
+ RegisterConditional("COND:LOGGEDIN", 2, ConditionalIsLoggedIn, CTX_NONE);
+ RegisterConditional("COND:MAY_CREATE_ROOM", 2, ConditionalHaveAccessCreateRoom, CTX_NONE);
return;
}