From b53cb9d192de97a82bfee73ef70aee97eb604985 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 20 Sep 2017 06:53:51 +0000 Subject: [PATCH] Fixed wrong request parameter decodation git-svn-id: https://svn.libreccm.org/ccm/trunk@5001 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/scimember/navigation/SciMemberList.java | 5 ++++- .../cms/sciproject/navigation/SciProjectList.java | 8 ++++++-- .../cms/scipublications/navigation/PublicationList.java | 5 ++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java b/ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java index 7527be3e5..0591020c6 100644 --- a/ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java +++ b/ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java @@ -1,5 +1,6 @@ package com.arsdigita.cms.scimember.navigation; +import com.arsdigita.globalization.Globalization; import com.arsdigita.navigation.Navigation; import com.arsdigita.navigation.ui.AbstractComponent; import com.arsdigita.persistence.SessionManager; @@ -94,7 +95,9 @@ public class SciMemberList extends AbstractComponent { final int offset; try { - final String surnameFilter = request.getParameter("surname"); +// final String surnameFilter = request.getParameter("surname"); + final String surnameFilter = Globalization.decodeParameter(request, + "surname"); if (surnameFilter != null && !surnameFilter.trim().isEmpty()) { whereBuffer diff --git a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java index 74422e124..a1706d9cf 100644 --- a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java +++ b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java @@ -1,5 +1,6 @@ package com.arsdigita.cms.sciproject.navigation; +import com.arsdigita.globalization.Globalization; import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.navigation.Navigation; import com.arsdigita.navigation.ui.AbstractComponent; @@ -99,7 +100,9 @@ public class SciProjectList extends AbstractComponent { final int page; final int offset; try { - final String titleFilter = request.getParameter("title"); +// final String titleFilter = request.getParameter("title"); + final String titleFilter = Globalization.decodeParameter(request, + "title"); final BigDecimal categoryFilter; if (request.getParameter("category") == null) { categoryFilter = null; @@ -145,7 +148,8 @@ public class SciProjectList extends AbstractComponent { orderBy)); projectsQueryStatement.setString(1, categoryId); projectsQueryStatement.setString(2, GlobalizationHelper - .getNegotiatedLocale().getLanguage()); + .getNegotiatedLocale() + .getLanguage()); projectsQueryStatement.setInt(3, limit); if (request.getParameter("page") == null) { diff --git a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java index bd87bb0a1..783eb6654 100644 --- a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java +++ b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java @@ -10,6 +10,7 @@ import com.arsdigita.cms.contenttypes.Proceedings; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.UnPublished; import com.arsdigita.cms.contenttypes.WorkingPaper; +import com.arsdigita.globalization.Globalization; import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.navigation.Navigation; import com.arsdigita.navigation.ui.AbstractComponent; @@ -284,7 +285,9 @@ public class PublicationList extends AbstractComponent { final int page; final int offset; try { - final String titleFilter = request.getParameter("title"); + final String titleFilter = Globalization.decodeParameter(request, + "title"); +// final String titleFilter = request.getParameter("title"); final Integer yearFilter; if (request.getParameter("yearOfPublication") == null) { yearFilter = null;