cmailleux 2005/12/19 17:18:45 CET
Modified files:
core/src/java/org/jahia/bin JahiaAdministration.java
Log:
Take the first language of the site to display the adminsitration menu when
switching site
Revision Changes Path
1.24 +39 -35
jahia/core/src/java/org/jahia/bin/JahiaAdministration.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java.diff?r1=1.23&r2=1.24&f=h
Index: JahiaAdministration.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JahiaAdministration.java 1 Dec 2005 07:08:17 -0000 1.23
+++ JahiaAdministration.java 19 Dec 2005 16:18:45 -0000 1.24
@@ -1,4 +1,4 @@
-// $Id: JahiaAdministration.java,v 1.23 2005/12/01 07:08:17 bpapez Exp $
+// $Id: JahiaAdministration.java,v 1.24 2005/12/19 16:18:45 cmailleux Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -42,9 +42,6 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -106,8 +103,9 @@
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import
org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.apache.struts.Globals;
-import java.util.Collections;
+import java.util.*;
/**
@@ -197,7 +195,7 @@
*/
public void service (HttpServletRequest request,
HttpServletResponse response) throws IOException,
- ServletException {
+
ServletException {
logger.debug("--[ " + request.getMethod() + " Request Start URI='" +
request.getRequestURI() + "' query='" +
request.getQueryString() + "'] --");
@@ -222,7 +220,7 @@
if (Jahia.isInitiated() && !Jahia.checkLockAccess(session)) {
session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
- "Sorry, Jahia is locked by a super admin. No more access
allowed.");
+ "Sorry, Jahia is locked by a super admin.
No more access allowed.");
displayLogin(request, response, session);
return;
}
@@ -243,7 +241,7 @@
PropertiesManager properties = new PropertiesManager(Jahia.
getJahiaPropertiesFileName());
installerURL = request.getContextPath() +
- properties.getProperty("jahiaEnginesDiskPath");
+
properties.getProperty("jahiaEnginesDiskPath");
// get the JahiaPrivate settings and config it with correct
values
// change Jahia core http to JahiaAdministration instead of
Jahia
@@ -268,7 +266,7 @@
ServicesRegistry.getInstance().getCacheService().syncClusterNow();
} catch (JahiaException je) {
JahiaErrorDisplay.DisplayException(request, response,
- getServletContext(), Jahia.getSettings(), je);
+
getServletContext(), Jahia.getSettings(), je);
org.jahia.services.database.ConnectionDispenser.
abortConnection();
}
@@ -734,25 +732,25 @@
logger.debug("Login granted: " + jahiaLoginUsername
+ " entered correct password.");
} else {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.isntadministrator1.label",
-
request.getLocale());
+
request.getLocale());
dspMsg += " ";
dspMsg += jahiaLoginUsername;
dspMsg += " ";
dspMsg +=
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.isntadministrator2.label",
-
request.getLocale());
+
request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
JahiaException je = new JahiaException(
"JahiaAdministration",
- "Login Error: User " + jahiaLoginUsername + " is
not an administrator.",
- JahiaException.SECURITY_ERROR,
JahiaException.WARNING_SEVERITY);
+ "Login
Error: User " + jahiaLoginUsername + " is not an administrator.",
+
JahiaException.SECURITY_ERROR, JahiaException.WARNING_SEVERITY);
logger.error("Error:", je);
}
} else {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.logininvalid.label",
- request.getLocale());
+
request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
JahiaException je = new JahiaException(
"JahiaAdministration",
- "Login Error: User " + jahiaLoginUsername + "
entered bad password.",
- JahiaException.SECURITY_ERROR,
JahiaException.WARNING_SEVERITY);
+ "Login Error:
User " + jahiaLoginUsername + " entered bad password.",
+
JahiaException.SECURITY_ERROR, JahiaException.WARNING_SEVERITY);
logger.error("Error:", je);
}
}
@@ -871,7 +869,7 @@
int maxDays = Integer.parseInt(daysLeftLimit.getValueStr());
long expirationTime = daysLeftValidator.
getComponentInstallDate().getTime() +
- (1000L * 60L * 60L * 24L) * maxDays;
+ (1000L * 60L * 60L *
24L) * maxDays;
long nowTime = System.currentTimeMillis();
long timeLeft = expirationTime - nowTime;
if (timeLeft < 0) {
@@ -924,10 +922,16 @@
} else {
try {
currentSite =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(siteID);
+ List languageSettingsAsLocales =
currentSite.getLanguageSettingsAsLocales(true);
+ if (languageSettingsAsLocales != null &&
languageSettingsAsLocales.size() > 0) {
+ Object o = languageSettingsAsLocales.get(0);
+ session.setAttribute(Globals.LOCALE_KEY, o);
+ session.setAttribute(ProcessingContext.SESSION_LOCALE,
o);
+ }
session.setAttribute( ProcessingContext.SESSION_SITE ,
currentSite);
} catch ( JahiaException je ) {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.logininvalid.label",
- request.getLocale());
+
request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
}
}
@@ -1035,7 +1039,7 @@
}
} catch(Exception e) {
- logger.error("Exception in isValidLoginSession", e);
+ logger.error("Exception in isValidLoginSession", e);
}
return isValid;
} // end isValidLoginSession
@@ -1078,7 +1082,7 @@
ParamBean jParams = null;
try {
-
+
BeanFactory bf =
SpringContextSingleton.getInstance().getContext();
ProcessingContextFactory pcf = (ProcessingContextFactory)
bf.getBean(ProcessingContextFactory.class.getName());
jParams = pcf.getContext(request, response, context);
@@ -1087,9 +1091,9 @@
if (jParams == null) {
throw new JahiaException(CLASS_NAME+".handleEngine",
- "ParamBean is null",
- JahiaException.ERROR_SEVERITY,
- JahiaException.CRITICAL_SEVERITY );
+ "ParamBean is null",
+ JahiaException.ERROR_SEVERITY,
+ JahiaException.CRITICAL_SEVERITY );
}
request.setAttribute("org.jahia.params.ParamBean",jParams);
process(request,response);
@@ -1190,12 +1194,12 @@
* @author Khue NGuyen
*/
static public void initAdminJahiaData( HttpServletRequest request,
- HttpServletResponse response,
- HttpSession
session)
+ HttpServletResponse
response,
+ HttpSession
session)
throws JahiaException, IOException, ServletException {
logger.debug( "started");
-
+
JahiaUser user = (JahiaUser) session.getAttribute(
ProcessingContext.SESSION_USER );
JahiaSite site = (JahiaSite) session.getAttribute(
ProcessingContext.SESSION_SITE );
@@ -1243,14 +1247,14 @@
}
AdminParamBean jParams = new AdminParamBean ( request,
- response,
- context,
- jSettings,
- startTime,
- intRequestMethod,
- site,
- user,
- contentPage );
+ response,
+ context,
+ jSettings,
+ startTime,
+ intRequestMethod,
+ site,
+ user,
+ contentPage );
if ( contentPage != null ){
try {
@@ -1282,7 +1286,7 @@
* @todo should call Struts' ActionServlet.process() method
*/
public void process(javax.servlet.http.HttpServletRequest request,
- javax.servlet.http.HttpServletResponse response)
+ javax.servlet.http.HttpServletResponse response)
throws java.io.IOException,
javax.servlet.ServletException{
try {
ParamBean jParams =
