X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=291bdc4e29808aba8518e78f30472bfb6d8e0ff4;hb=b1f098e37cd116a6d084d8688d350b8299197450;hp=c5533635ee4aac5745e68e342801c9208f2779c2;hpb=e42ecea2db8ff123f268edf48190d6b9b28fcedb;p=mir.git

diff --git a/source/OpenMir.java b/source/OpenMir.java
index c5533635..291bdc4e 100755
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 import java.io.*;
 import java.util.*;
 import java.net.*;
@@ -25,11 +56,13 @@ import mircoders.storage.*;
 
 
 public class OpenMir extends AbstractServlet {
-
+  
   //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
 
+  private boolean nameSet = false;
+
   public void doGet(HttpServletRequest req, HttpServletResponse res)
     throws ServletException, IOException {
     doPost(req,res);
@@ -46,19 +79,19 @@ public class OpenMir extends AbstractServlet {
     if(getServletContext().getAttribute("mir.confed") == null) {
       getConfig(req);
     }
+    if (!nameSet) {
+        MirConfig.setOpenServletName(getServletName());
+        nameSet = true;
+    }
+      
     session = req.getSession();
 
     if(session.getAttribute("Language")==null){
-      if (req.getParameter("language")!=null) {
-        setLanguage(session, req.getParameter("language"));
-      }
-      else {
-        setLanguage(session, getAcceptLanguage(req));
-      }
+      setLanguage(session,getAcceptLanguage(req));
     }
 
-    if (req.getParameter("language")!=null)
-      setLocale(session, new Locale(req.getParameter("language"), "") );
+    //make sure client browsers don't cache anything
+    setNoCaching(res);
 
     res.setContentType("text/html; charset="
                       +MirConfig.getProp("Mir.DefaultEncoding"));
@@ -78,14 +111,14 @@ public class OpenMir extends AbstractServlet {
   }
 
   private void handleUserError(HttpServletRequest req, HttpServletResponse res,
-                               PrintWriter out, String errorString) {
+															 PrintWriter out, String errorString) {
     try {
       theLog.printError(errorString);
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
       HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.UserErrorTemplate"),
-                                    modelRoot, out, req.getLocale() );
+																		modelRoot, out, req.getLocale() );
       out.close();
     }
     catch (Exception e) {
@@ -101,9 +134,9 @@ public class OpenMir extends AbstractServlet {
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
-                                               new GregorianCalendar())));
+																							 new GregorianCalendar())));
       HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),
-                                    modelRoot,out, req.getLocale());
+																		modelRoot,out, req.getLocale());
       out.close();
     }
     catch (Exception e) {