axdefs[6] = _("Aide"); /* chief */
}
+int ReEstablish_Session(void)
+{
+ StrBuf *Buf = NewStrBuf();
+ wcsession *WCC = WC;
+ serv_printf("USER %s", ChrPtr(WCC->Hdr->c_username));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 3) {
+ serv_printf("PASS %s", ChrPtr(WCC->Hdr->c_password));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ become_logged_in(WCC->Hdr->c_username,
+ WCC->Hdr->c_password, Buf);
+ get_preference("default_header_charset", &WCC->DefaultCharset);
+ }
+ }
+ /*
+ * If we don't have a current room, but a cookie specifying the
+ * current room is supplied, make an effort to go there.
+ */
+ if ((StrLength(WCC->wc_roomname) == 0) && (StrLength(WCC->Hdr->c_roomname) > 0)) {
+ serv_printf("GOTO %s",
+ ChrPtr(WCC->Hdr->c_roomname));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ if (WCC->wc_roomname == NULL) {
+ WCC->wc_roomname = NewStrBufDup(WCC->Hdr->c_roomname);
+ }
+ else {
+ FlushStrBuf(WCC->wc_roomname);
+ StrBufAppendBuf(WCC->wc_roomname, WCC->Hdr->c_roomname, 0);
+ }
+ }
+ }
+ FreeStrBuf(&Buf);
+ return 0;
+}
/*
svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
- ChrPtr(serv_info.serv_humannode));
+ ChrPtr(WC->serv_info->serv_humannode));
do_template("openid_manual_create", NULL);
wDumpContent(2);
void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response)
{
wcsession *WCC = WC;
- char buf[SIZ];
+ StrBuf *Buf;
StrBuf *FloorDiv;
+ StrBuf *Language = NULL;
- WC->logged_in = 1;
+ WCC->logged_in = 1;
if (WCC->wc_fullname == NULL)
WCC->wc_fullname = NewStrBufPlain(NULL, StrLength(serv_response));
load_preferences();
+ Buf = NewStrBuf();
serv_puts("CHEK");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- WC->new_mail = extract_int(&buf[4], 0);
- WC->need_regi = extract_int(&buf[4], 1);
- WC->need_vali = extract_int(&buf[4], 2);
- extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ const char *pch;
+
+ pch = ChrPtr(Buf) + 4;
+ 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();
+ StrBufExtract_NextToken(WCC->cs_inet_email, Buf, &pch, '|');
+ }
+ if (havebstr("language"))
+ set_preference("language", NewStrBufDup(SBSTR("language")), 1);
+ else {
+ get_preference("language", &Language);
+ if (Language != NULL) {
+ set_selected_language(ChrPtr(Language));
+ go_selected_language(); /* set locale */
+ }
}
-
get_preference("floordiv_expanded", &FloorDiv);
- WC->floordiv_expanded = FloorDiv;
+ WCC->floordiv_expanded = FloorDiv;
+ FreeStrBuf(&Buf);
}
}
}
if (WCC->logged_in) {
- set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
if (WCC->need_regi) {
display_reg(1);
} else if (WCC->need_vali) {
snprintf(buf, sizeof buf,
"OIDS %s|%s://%s/finalize_openid_login|%s://%s",
bstr("openid_url"),
- (is_https ? "https" : "http"), ChrPtr(WCC->http_host),
- (is_https ? "https" : "http"), ChrPtr(WCC->http_host)
+ (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->http_host),
+ (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->http_host)
);
serv_puts(buf);
const char *HKey;
HashPos *Cursor;
- Cursor = GetNewHashPos (WCC->urlstrings, 0);
- while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
+ Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
+ while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
u = (urlcontent*) U;
if (!strncasecmp(u->url_key, "openid.", 7)) {
serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data));
*/
void do_logout(void)
{
+ wcsession *WCC = WC;
char buf[SIZ];
- FlushStrBuf(WC->wc_username);
- FlushStrBuf(WC->wc_password);
- FlushStrBuf(WC->wc_roomname);
- FlushStrBuf(WC->wc_fullname);
+ FlushStrBuf(WCC->wc_username);
+ FlushStrBuf(WCC->wc_password);
+ FlushStrBuf(WCC->wc_roomname);
+ FlushStrBuf(WCC->wc_fullname);
/* FIXME: this is to suppress the iconbar displaying, because we aren't
actually logged out yet */
- WC->logged_in = 0;
+ WCC->logged_in = 0;
/** Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
serv_puts("MESG goodbye");
serv_getln(buf, sizeof buf);
- if (WC->serv_sock >= 0) {
+ if (WCC->serv_sock >= 0) {
if (buf[0] == '1') {
fmout("CENTER");
} else {
wprintf("<hr /><div class=\"buttons\"> "
"<span class=\"button_link\"><a href=\".\">");
wprintf(_("Log in again"));
- wprintf("</a></span> <span class=\"button_link\">"
+ wprintf("</a></span>");
+
+ /* The "close window" link is commented out because some browsers don't
+ * allow it to work.
+ *
+ wprintf(" <span class=\"button_link\">"
"<a href=\"javascript:window.close();\">");
wprintf(_("Close window"));
- wprintf("</a></span></div></div></div></div>\n");
+ wprintf("</a></span>");
+ */
+
+ wprintf("</div></div></div></div>\n");
wDumpContent(2);
end_webcit_session();
}
*/
void display_reg(int during_login)
{
+ StrBuf *Buf;
+ message_summary *VCMsg;
+ wc_mime_attachment *VCAtt;
long vcard_msgnum;
- if (goto_config_room() != 0) {
+ Buf = NewStrBuf();
+ if (goto_config_room(Buf) != 0) {
if (during_login) do_welcome();
else display_main_menu();
+ FreeStrBuf(&Buf);
return;
}
- vcard_msgnum = locate_user_vcard_in_this_room();
+ FreeStrBuf(&Buf);
+ vcard_msgnum = locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
if (vcard_msgnum < 0L) {
if (during_login) do_welcome();
else display_main_menu();
}
if (during_login) {
- do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM);
+ do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
}
else {
- do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM);
+ do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
}
}
InitModule_AUTH
(void)
{
- WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS);
+ WebcitAddUrlHandler(HKEY(""), do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
+ WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+ WebcitAddUrlHandler(HKEY("login"), do_login, ANONYMOUS|COOKIEUNNEEDED);
WebcitAddUrlHandler(HKEY("display_openid_login"), _display_openid_login, ANONYMOUS);
WebcitAddUrlHandler(HKEY("openid_login"), do_openid_login, ANONYMOUS);
WebcitAddUrlHandler(HKEY("finalize_openid_login"), finalize_openid_login, ANONYMOUS);
WebcitAddUrlHandler(HKEY("openid_manual_create"), openid_manual_create, ANONYMOUS);
- WebcitAddUrlHandler(HKEY("do_logout"), do_logout, 0);
+ WebcitAddUrlHandler(HKEY("do_logout"), do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
WebcitAddUrlHandler(HKEY("validate"), validate, 0);
WebcitAddUrlHandler(HKEY("display_reg"), _display_reg, 0);
WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
return ;
}
+
+
+void
+SessionDestroyModule_AUTH
+(wcsession *sess)
+{
+ FreeStrBuf(&sess->wc_username);
+ FreeStrBuf(&sess->wc_fullname);
+ FreeStrBuf(&sess->wc_password);
+ FreeStrBuf(&sess->wc_roomname);
+ FreeStrBuf(&sess->httpauth_user);
+ FreeStrBuf(&sess->httpauth_pass);
+ FreeStrBuf(&sess->cs_inet_email);
+}
projects / citadel.git / blobdiff