X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=3704061f7f4c8ae61402aea8c1987de079848872;hb=502b5f3d4e7ce4ad732e408a1fde39c5bbc873d8;hp=8dfce2214e839c7422098e687df52ada03960bcf;hpb=0062014d4e66c839106c1bef608e3316c9935a1b;p=citadel.git

diff --git a/webcit/auth.c b/webcit/auth.c
index 8dfce2214..3704061f7 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -116,7 +116,6 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo
 	wcsession *WCC = WC;
 	StrBuf *Buf;
 	StrBuf *FloorDiv;
-	StrBuf *Language = NULL;
 
 	WCC->logged_in = 1;
 
@@ -160,15 +159,6 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo
 			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);
@@ -183,6 +173,8 @@ void do_login(void)
 	wcsession *WCC = WC;
 	StrBuf *Buf;
 
+	lprintf(9, "SELECTED LANGUAGE: '%s'\n", bstr("language"));
+
 	if (havebstr("language")) {
 		set_selected_language(bstr("language"));
 		go_selected_language();
@@ -974,10 +966,14 @@ void Header_HandleCookie(StrBuf *Line, ParsedHttpHdrs *hdr)
 		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;
 }