LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BugFix for LanguageExtension redirect. The redirect was also applied when the feature was disabled in the configuration. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5118 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-11-13 07:33:34 +00:00
parent c05404d5ae
commit 40d6de55e3
1 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
ccm-navigation/src/com/arsdigita/navigation/NavigationFileResolver.java
View File

@ -78,74 +78,80 @@ public class NavigationFileResolver extends DefaultApplicationFileResolver {
} }
if (!path.endsWith(".jsp")) { if (!path.endsWith(".jsp")) {
if (CMSConfig.getInstanceOf().getUseLanguageExtension() if (CMSConfig.getInstanceOf().getUseLanguageExtension()) {
&& path.matches("(.*)/index\\.[a-zA-Z]{2}")) { if (path.matches("(.*)/index\\.[a-zA-Z]{2}")) {
final String lang = path.substring(path.length() - 2); final String lang = path.substring(path.length() - 2);
path = path.substring(0, path.length() - "index.$$".length()); path = path
GlobalizationHelper.setSelectedLocale(lang); .substring(0, path.length() - "index.$$".length());
} else { GlobalizationHelper.setSelectedLocale(lang);
String lang;
if (GlobalizationHelper.getSelectedLocale(sreq) == null) {
lang = GlobalizationHelper.getNegotiatedLocale()
.getLanguage();
} else { } else {
lang = GlobalizationHelper.getSelectedLocale(sreq)
.getLanguage();
}
final StringBuffer redirectTo = new StringBuffer(); String lang;
if (GlobalizationHelper.getSelectedLocale(sreq) == null) {
redirectTo lang = GlobalizationHelper.getNegotiatedLocale()
.append(DispatcherHelper.getRequest().getScheme()) .getLanguage();
.append("://") } else {
.append(DispatcherHelper.getRequest().getServerName()); lang = GlobalizationHelper.getSelectedLocale(sreq)
.getLanguage();
if (DispatcherHelper.getRequest().getServerPort() != 80
&& DispatcherHelper.getRequest().getServerPort() != 443) {
redirectTo
.append(":")
.append(DispatcherHelper.getRequest().getServerPort());
}
if (DispatcherHelper.getWebappContext() != null
&& !DispatcherHelper.getWebappContext().trim().isEmpty()) {
redirectTo.append(DispatcherHelper.getWebappContext());
}
//Is category available in lang? If not change lang to default language
final Category[] cats = resolvePath(getRootCategory(), path);
if (cats == null) {
lang = KernelConfig.getConfig().getDefaultLanguage();
} else {
final CategoryLocalizationCollection langs
= cats[cats.length
- 1]
.getCategoryLocalizationCollection();
if (!langs.localizationExists(lang)) {
lang = KernelConfig.getConfig().getDefaultLanguage();
} }
}
redirectTo final StringBuffer redirectTo = new StringBuffer();
.append("/ccm")
.append(app.getPath())
.append(path);
if (!path.endsWith("/")) {
redirectTo.append('/');
}
redirectTo
.append("index.")
.append(lang);
sresp.setHeader("Location", redirectTo.toString()); redirectTo
try { .append(DispatcherHelper.getRequest().getScheme())
sresp.sendError(HttpServletResponse.SC_MOVED_PERMANENTLY); .append("://")
} catch (IOException ex) { .append(DispatcherHelper.getRequest().getServerName());
throw new RuntimeException(ex);
if (DispatcherHelper.getRequest().getServerPort() != 80
&& DispatcherHelper.getRequest().getServerPort()
!= 443) {
redirectTo
.append(":")
.append(DispatcherHelper.getRequest()
.getServerPort());
}
if (DispatcherHelper.getWebappContext() != null
&& !DispatcherHelper.getWebappContext().trim()
.isEmpty()) {
redirectTo.append(DispatcherHelper.getWebappContext());
}
//Is category available in lang? If not change lang to default language
final Category[] cats = resolvePath(getRootCategory(), path);
if (cats == null) {
lang = KernelConfig.getConfig().getDefaultLanguage();
} else {
final CategoryLocalizationCollection langs
= cats[cats.length
- 1]
.getCategoryLocalizationCollection();
if (!langs.localizationExists(lang)) {
lang = KernelConfig.getConfig().getDefaultLanguage();
}
}
redirectTo
.append("/ccm")
.append(app.getPath())
.append(path);
if (!path.endsWith("/")) {
redirectTo.append('/');
}
redirectTo
.append("index.")
.append(lang);
sresp.setHeader("Location", redirectTo.toString());
try {
sresp
.sendError(HttpServletResponse.SC_MOVED_PERMANENTLY);
} catch (IOException ex) {
throw new RuntimeException(ex);
}
return null;
} }
return null;
} }
} }