if (StrLength(username) > 0) {
Buf = NewStrBufPlain(NULL, StrLength(username));
- StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+ StrEscAppend(Buf, username, NULL, 0, 0);
svprintf(HKEY("REASON"), WCS_STRING,
_("However, the user name '%s' conflicts with an existing user."),
ChrPtr(Buf));
wcsession *WCC = WC;
StrBuf *Buf;
- lprintf(9, "SELECTED LANGUAGE: '%s'\n", bstr("language"));
-
if (havebstr("language")) {
set_selected_language(bstr("language"));
go_selected_language();
*/
if (!get_preference("startpage", &Buf)) {
Buf = NewStrBuf ();
- StrBufPrintf(Buf, "dotskip&room=_BASEROOM_");
+ StrBufPrintf(Buf, "dotskip?room=_BASEROOM_");
set_preference("startpage", Buf, 1);
}
if (ChrPtr(Buf)[0] == '/') {
StrBufCutLeft(Buf, 1);
}
- if (StrLength(Buf) == 0)
+ if (StrLength(Buf) == 0) {
StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
+ }
+ lprintf(9, "Redirecting to user's start page: %s\n", ChrPtr(Buf));
http_redirect(ChrPtr(Buf));
}
void display_reg(int during_login)
{
StrBuf *Buf;
- message_summary *VCMsg;
- wc_mime_attachment *VCAtt;
+ message_summary *VCMsg = NULL;
+ wc_mime_attachment *VCAtt = NULL;
long vcard_msgnum;
Buf = NewStrBuf();
if (goto_config_room(Buf) != 0) {
- if (during_login) do_welcome();
- else display_main_menu();
+ lprintf(9, "display_reg() exiting because goto_config_room() failed\n");
+ if (during_login) {
+ do_welcome();
+ }
+ else {
+ display_main_menu();
+ }
FreeStrBuf(&Buf);
return;
}
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();
+ lprintf(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
+ if (during_login) {
+ do_welcome();
+ }
+ else {
+ display_main_menu();
+ }
return;
}
do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
}
else {
- do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
+ StrBuf *ReturnTo;
+ ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+ StrBufAppendBuf(ReturnTo, WC->wc_roomname, 0);
+ do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
+ FreeStrBuf(&ReturnTo);
}
+ /* FIXME - don't we have to free VCMsg and VCAtt ?? */
}
return (WCC != NULL)? (WCC->is_room_aide == 0) : 0;
}
+
int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
return (WCC != NULL)? (WCC->logged_in == 0) : 0;
}
+
+
int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
}
+void _display_openid_login(void) {
+ display_openid_login(NULL);
+}
+
+
+void _display_reg(void) {
+ display_reg(0);
+}
-void _display_openid_login(void) {display_openid_login(NULL);}
-void _display_reg(void) {display_reg(0);}
void Header_HandleAuth(StrBuf *Line, ParsedHttpHdrs *hdr)
{
StrBufAppendBufPlain(hdr->HR.plainauth, HKEY(":"), 0);
StrBufAppendBuf(hdr->HR.plainauth, hdr->HR.user_agent, 0);
hdr->HR.SessionKey = hashlittle(SKEY(hdr->HR.plainauth), 89479832);
-
+/*
+ lprintf(1, "CheckAuthBasic: calculated sessionkey %ld\n",
+ hdr->HR.SessionKey);
+*/
}
void GetAuthBasic(ParsedHttpHdrs *hdr)
StrBufCutLeft(hdr->HR.RawCookie, (pch - ChrPtr(hdr->HR.RawCookie)) + 7);
StrBufDecodeHex(hdr->HR.RawCookie);
- if (hdr->c_username == NULL)
- hdr->c_username = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_USER));
- if (hdr->c_password == NULL)
- hdr->c_password = NewStrBufPlain(HKEY(DEFAULT_HTTPAUTH_PASS));
- if (hdr->c_roomname == NULL)
- hdr->c_roomname = NewStrBuf();
- if (hdr->c_language == NULL)
- hdr->c_language = NewStrBuf();
cookie_to_stuff(Line, &hdr->HR.desired_session,
hdr->c_username,
hdr->c_password,
hdr->HR.got_auth = AUTH_COOKIE;
}
+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();
+ httpreq->c_language = NewStrBuf();
+}
void
HttpDetachModule_AUTH
(ParsedHttpHdrs *httpreq)