1.1 restoration

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index f8cc73e..dfdbe4d 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,19 +18,19 @@
  * 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.
+ * the code of this program with  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.IOException;
 import java.io.PrintWriter;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,14 +40,13 @@ import mir.servlet.AbstractServlet;
 import mir.servlet.ServletModuleDispatch;
 import mir.servlet.ServletModuleUserExc;
 import mir.util.ExceptionFunctions;
-import mircoders.global.MirGlobal;
 import mircoders.servlet.ServletModuleOpenIndy;
 
 /**
  *  OpenMir.java - main servlet for open posting and comment feature to articles
  *
  *  @author RK 1999-2001, the mir-coders group
- *  @version $Id: OpenMir.java,v 1.31 2003/04/09 02:06:06 zapata Exp $
+ *  @version $Id: OpenMir.java,v 1.35.2.3 2004/11/21 22:07:13 zapata Exp $
  *
  */
 
@@ -55,10 +54,10 @@ import mircoders.servlet.ServletModuleOpenIndy;
 public class OpenMir extends AbstractServlet {
   public void process(HttpServletRequest aRequest, HttpServletResponse aResponse)
         throws ServletException, IOException {
-                if ((configuration.getString("RootUri") == null) ||
-                        configuration.getString("RootUri").equals("")) {
-                  configuration.setProperty("RootUri", aRequest.getContextPath());
-                }
+    if ((configuration.getString("RootUri") == null) ||
+        configuration.getString("RootUri").equals("")) {
+      configuration.setProperty("RootUri", aRequest.getContextPath());
+    }
 
     long startTime = System.currentTimeMillis();
     long sessionConnectTime=0;
@@ -70,8 +69,7 @@ public class OpenMir extends AbstractServlet {
     //make sure client browsers don't cache anything
     setNoCaching(aResponse);
 
-    aResponse.setContentType("text/html");
-    //aResponse.setContentType("text/html; charset="+MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset"));
+    aResponse.setContentType("text/html; charset="+configuration.getString("Mir.DefaultHTMLCharset"));
 
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse);
@@ -101,35 +99,5 @@ public class OpenMir extends AbstractServlet {
   public String getServletInfo(){
     return "OpenMir "+configuration.getString("Mir.Version");
   }
-
-
-  /**
-   * Selects the language for the response.
-   *
-   * @param session
-   * @param aRequest
-   */
-  private void checkLanguage(HttpSession aSession, HttpServletRequest aRequest) {
-    String requestLanguage = aRequest.getParameter("language");
-    String sessionLanguage = (String) aSession.getAttribute("language");
-    String acceptLanguage = aRequest.getLocale().getLanguage();
-    String defaultLanguage = MirGlobal.config().getString("Mir.Login.DefaultLanguage", "en");
-
-    logger.debug(" requestlanguage = " + requestLanguage + ", sessionLanugage = " + sessionLanguage +
-                 ", acceptLanguage = " + acceptLanguage + ", defaultLanguage = " + defaultLanguage);
-
-    String language = requestLanguage;
-
-    if (language==null)
-      language = sessionLanguage;
-
-    if (language==null)
-      language = acceptLanguage;
-
-    if (language==null)
-      language = defaultLanguage;
-
-    setLanguage(aSession, language);
-  }
 }