From: mh <mh>
Date: Mon, 23 Dec 2002 03:00:11 +0000 (+0000)
Subject: If Mir.Login.DefaulLanguage is _empty_ then set the default to the browsers current... 
X-Git-Tag: BEFORE_MERGE_1_1~375
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6591d89620a4f0e162046de2cdf4c2eb9ed62477;p=mir.git

If Mir.Login.DefaulLanguage is _empty_ then set the default to the browsers current accept-language setting. This is useful for international sites like PGA. also, merge no-cache stuff into AbstractServlet's setNoChaching method
---

diff --git a/source/Mir.java b/source/Mir.java
index 595696f7..263c4cd9 100755
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -65,8 +65,8 @@ import mircoders.storage.DatabaseUsers;
 /**
  * Mir.java - main servlet, that dispatches to servletmodules
  *
- * @author $Author: zapata $
- * @version $Id: Mir.java,v 1.24 2002/12/17 19:20:31 zapata Exp $
+ * @author $Author: mh $
+ * @version $Id: Mir.java,v 1.25 2002/12/23 03:00:11 mh Exp $
  *
  */
 
@@ -149,14 +149,11 @@ public class Mir extends AbstractServlet {
     else
       http = "http";
 
-    //nothing in Mir can or should be cached as it's all dynamic...
-    //
-    //this needs to be done here and not per page (via meta tags) as some
-    //browsers have problems w/ it per-page -mh
-    res.setHeader("Pragma", "no-cache");
-    res.setDateHeader("Expires", 0);
-    res.setHeader("Cache-Control", "no-cache");
-    res.setContentType("text/html; charset=" + MirConfig.getProp("Mir.DefaultEncoding"));
+
+    //make sure client browsers don't cache anything
+    setNoCaching(res);
+
+    res.setContentType("text/html; charset=" + MirConfig.getProp("Mir.DefaultHTMLCharset"));
 
     String moduleName = req.getParameter("module");
     checkLanguage(session, req);
@@ -387,7 +384,10 @@ public class Mir extends AbstractServlet {
 
       mergeData.put("session", sessionUrl);
 
-      mergeData.put("defaultlanguage", MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "en"));
+      String defaultlanguage = MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "");
+      if (defaultlanguage.length() == 0)
+        defaultlanguage = req.getLocale().getLanguage();
+      mergeData.put("defaultlanguage",  defaultlanguage);
       mergeData.put("languages", getLoginLanguages());
 
       HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));