wcsession *WCC = WC;
StrBuf *Buf;
StrBuf *FloorDiv;
- StrBuf *Language = NULL;
WCC->logged_in = 1;
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);
WCC->floordiv_expanded = FloorDiv;
FreeStrBuf(&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();
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->desired_session,
hdr->c_username,
hdr->c_password,
- hdr->c_roomname);
+ hdr->c_roomname,
+ hdr->c_language
+ );
hdr->got_auth = AUTH_COOKIE;
}
/*
* $Id$
*/
-/**
- * \defgroup CookieConversion Grep Cookies
- * Utility functions which convert the HTTP cookie format we use to and
- * from user/password/room strings.
- *
- * \ingroup WebcitHttpServer
- */
-/*@{*/
-#include "webcit.h"
+#include "webcit.h"
-#define TRUE 1 /**< for sure? */
-#define FALSE 0 /**< nope. */
-
-typedef unsigned char byte; /**< Byte type */
+typedef unsigned char byte; /* Byte type used by cookie_to_stuff() */
-/**
- * \brief find cookie
+/*
* Pack all session info into one easy-to-digest cookie. Healthy and delicious!
- * \param cookie cookie string to create???
- * \param session the session we want to convert into a cookie
- * \param user the user to be associated with the cookie
- * \param pass his passphrase
- * \param room the room he wants to enter
*/
void stuff_to_cookie(char *cookie, size_t clen, int session,
- StrBuf *user, StrBuf *pass, StrBuf *room)
+ StrBuf *user, StrBuf *pass, StrBuf *room, char *language)
{
char buf[SIZ];
int i;
int len;
- len = snprintf(buf, SIZ, "%d|%s|%s|%s|",
- session,
- ChrPtr(user),
- ChrPtr(pass),
- ChrPtr(room));
+ len = snprintf(buf, SIZ, "%d|%s|%s|%s|%s|",
+ session,
+ ChrPtr(user),
+ ChrPtr(pass),
+ ChrPtr(room),
+ language
+ );
strcpy(cookie, "");
for (i=0; (i < len) && (i * 2 < clen); ++i) {
}
}
-/**
- * \brief Convert unpacked hex string to an integer
- * \param in Input hex string
- * \param len the length of the string
- * \return the corrosponding integer value
+/*
+ * Convert unpacked hex string to an integer
*/
int xtoi(const char *in, size_t len)
{
return val;
}
-/**
- * \brief Extract all that fun stuff out of the cookie.
- * \param cookie the cookie string
- * \param session the corrosponding session to return
- * \param user the user string
- * \param user_len the user stringlength
- * \param pass the passphrase
- * \param pass_len length of the passphrase string
- * \param room the room he is in
- * \param room_len the length of the room string
+/*
+ * Extract all that fun stuff out of the cookie.
*/
-void cookie_to_stuff(StrBuf *cookie, int *session,
- StrBuf *user,
- StrBuf *pass,
- StrBuf *room)
+void cookie_to_stuff(StrBuf *cookie,
+ int *session,
+ StrBuf *user,
+ StrBuf *pass,
+ StrBuf *room,
+ StrBuf *language)
{
-/* debug
- char t[256];
- extract_token(t, buf, 0, '|', sizeof t);
- lprintf(9, "SESS: %s\n", t);
- extract_token(t, buf, 1, '|', sizeof t);
- lprintf(9, "USER: %s\n", t);
- extract_token(t, buf, 2, '|', sizeof t);
- lprintf(9, "PASS: %s\n", t);
- extract_token(t, buf, 3, '|', sizeof t);
- lprintf(9, "ROOM: %s\n", t);
- debug */
-
- if (session != NULL)
+ if (session != NULL) {
*session = StrBufExtract_int(cookie, 0, '|');
- if (user != NULL)
+ }
+ if (user != NULL) {
StrBufExtract_token(user, cookie, 1, '|');
- if (pass != NULL)
+ }
+ if (pass != NULL) {
StrBufExtract_token(pass, cookie, 2, '|');
- if (room != NULL)
+ }
+ if (room != NULL) {
StrBufExtract_token(room, cookie, 3, '|');
+ }
+ if (language != NULL) {
+ StrBufExtract_token(language, cookie, 4, '|');
+ }
}
-/*@}*/
StrBuf *c_username;
StrBuf *c_password;
StrBuf *c_roomname;
+ StrBuf *c_language;
StrBuf *RawCookie;
int desired_session;
void begin_critical_section(int which_one);
void end_critical_section(int which_one);
-
-void stuff_to_cookie(char *cookie, size_t clen, int session,
- StrBuf *user, StrBuf *pass, StrBuf *room);
-void cookie_to_stuff(StrBuf *cookie, int *session,
- StrBuf *user,
- StrBuf *pass,
- StrBuf *room);
+void stuff_to_cookie(char *cookie, size_t clen,
+ int session,
+ StrBuf *user,
+ StrBuf *pass,
+ StrBuf *room,
+ char *language
+);
+void cookie_to_stuff(StrBuf *cookie,
+ int *session,
+ StrBuf *user,
+ StrBuf *pass,
+ StrBuf *room,
+ StrBuf *language
+);
void locate_host(StrBuf *TBuf, int);
void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response);
void openid_manual_create(void);