From: Art Cancro <ajc@citadel.org>
Date: Thu, 11 Jun 2009 21:31:16 +0000 (+0000)
Subject: * SessionNewModule_GETTEXT() was expecting a StrBuf but getting a OneHTTPHeader,... 
X-Git-Tag: v7.86~1081
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3cd944696a5c90eeff693cb2b82dae77cb048915

* SessionNewModule_GETTEXT() was expecting a StrBuf but getting a OneHTTPHeader, causing the browser's preferred language to be detected as '(null)'.  Fixed.
---

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 501132188..12a1bc99d 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -61,7 +61,7 @@ void httplang_to_locale(StrBuf *LocaleString, wcsession *sess)
 	int nParts;
 	StrBuf *Buf = NULL;
 	StrBuf *SBuf = NULL;
-	
+
 	nParts=StrBufNum_tokens(LocaleString,',');
 	for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
         {
@@ -395,12 +395,14 @@ SessionNewModule_GETTEXT
 (wcsession *sess)
 {
 #ifdef ENABLE_NLS
-	void *vLine;
-	////TODO: make me a header getter
-	if ((sess->Hdr->HTTPHeaders!= NULL) &&
-	    GetHash(sess->Hdr->HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), &vLine) && 
-	    (vLine != NULL)) {
-		StrBuf *accept_language = (StrBuf*) vLine;
+	OneHttpHeader *vLine = NULL;
+
+	if (	(sess->Hdr->HTTPHeaders != NULL)
+		&& GetHash(sess->Hdr->HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), (void *)&vLine)
+		&& (vLine != NULL)
+		&& (vLine->Val != NULL)
+	) {
+		StrBuf *accept_language = vLine->Val;
 		httplang_to_locale(accept_language, sess);
 	}
 #endif