Move the "dbObject"s to their own package.

[gigi.git] / src / org / cacert / gigi / pages / Page.java

diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index a1309c9f74e497aaf077efe9c5dfb2580ecc5eb0..0bd02f789f115022277cd02391f41e676970b1c3 100644 (file)
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -2,20 +2,24 @@ package org.cacert.gigi.pages;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Enumeration;
+import java.util.Locale;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
-import org.cacert.gigi.Language;
-import org.cacert.gigi.User;
+import org.cacert.gigi.PermissionCheckable;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Template;
 
 /**
  * This class encapsulates a sub page of Gigi. A template residing nearby this
  * class with name <className>.templ will be loaded automatically.
  */
-public abstract class Page {
+public abstract class Page implements PermissionCheckable {
 
     private String title;
 
@@ -103,7 +107,25 @@ public abstract class Page {
     }
 
     public static Language getLanguage(ServletRequest req) {
-        return Language.getInstance("de");
+        HttpSession session = ((HttpServletRequest) req).getSession();
+        Locale sessval = (Locale) session.getAttribute(Language.SESSION_ATTRIB_NAME);
+        if (sessval != null) {
+            Language l = Language.getInstance(sessval);
+            if (l != null) {
+                return l;
+            }
+        }
+        Enumeration<Locale> langs = req.getLocales();
+        while (langs.hasMoreElements()) {
+            Locale c = langs.nextElement();
+            Language l = Language.getInstance(c);
+            if (l != null) {
+                session.setAttribute(Language.SESSION_ATTRIB_NAME, l.getLocale());
+                return l;
+            }
+        }
+        session.setAttribute(Language.SESSION_ATTRIB_NAME, Locale.ENGLISH);
+        return Language.getInstance(Locale.ENGLISH);
     }
 
     public static String translate(ServletRequest req, String string) {
@@ -115,4 +137,9 @@ public abstract class Page {
         return LoginPage.getUser(req);
     }
 
+    @Override
+    public boolean isPermitted(User u) {
+        return !needsLogin() || u != null;
+    }
+
 }