From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 29 Jul 2008 19:11:18 +0000 (+0000)
Subject: * make param const char *
X-Git-Tag: v7.86~2067
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f4cdbd3692e2e04c711cfa1cb11d3a6dace2061f

* make param const char *
* goto _BASEROOM_ if no pref is set
* store/load locales inn case of webcit tries to reauthenticate a user by cookie after a crash.
---

diff --git a/webcit/auth.c b/webcit/auth.c
index d347e7841..41489194a 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -286,6 +286,7 @@ void do_login(void)
 		}
 	}
 	if (WC->logged_in) {
+		set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
 		if (WC->need_regi) {
 			display_reg(1);
 		} else if (WC->need_vali) {
@@ -540,7 +541,7 @@ void do_welcome(void)
 		StrBufCutLeft(Buf, 1);
 	}
 	if (StrLength(Buf) == 0)
-		StrBufAppendBufPlain(Buf, "/knrooms", 1, 0);
+		StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
 	http_redirect(ChrPtr(Buf));
 }
 
diff --git a/webcit/gettext.c b/webcit/gettext.c
index f463140c2..f044ab6ac 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -220,8 +220,9 @@ void offer_languages(void) {
  * \brief Set the selected language for this session.
  * \param lang the locale to set.
  */
-void set_selected_language(char *lang) {
+void set_selected_language(const char *lang) {
 	int i;
+
 #ifdef HAVE_USELOCALE
 	for (i=0; i<NUM_LANGS; ++i) {
 		if (!strcasecmp(lang, AvailLang[i])) {
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 7638cbf20..fc3a35f2a 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1606,7 +1606,7 @@ void session_loop(struct httprequest *req)
 			}
 		}
 	}
-
+////////todo: restorte language in this case
 	/*
 	 * Functions which can be performed without logging in
 	 */
@@ -1692,7 +1692,12 @@ void session_loop(struct httprequest *req)
 			serv_printf("PASS %s", c_password);
 			serv_getln(buf, sizeof buf);
 			if (buf[0] == '2') {
+				StrBuf *Lang;
 				become_logged_in(c_username, c_password, buf);
+				if (get_preference("language", &Lang)) {
+					set_selected_language(ChrPtr(Lang));
+					go_selected_language();		/* set locale */
+				}
 			}
 		}
 	}
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 572b42ff0..1e02177b5 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -716,7 +716,7 @@ int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
 void spawn_another_worker_thread(void);
 void display_rss(char *roomname, char *request_method);
 void offer_languages(void);
-void set_selected_language(char *);
+void set_selected_language(const char *);
 void go_selected_language(void);
 void stop_selected_language(void);
 void preset_locale(void);