LPS-27281 - Escape ckEditorConfigFileName param in ckeditor.jsp

mhan810 · May 14, 2012 · acf5100 · acf5100
1 parent e3de21d
commit acf5100
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/portal-web/docroot/html/js/editor/ckeditor.jsp b/portal-web/docroot/html/js/editor/ckeditor.jsp
@@ -29,7 +29,7 @@ if (Validator.isNull(doAsUserId)) {
 
 long doAsGroupId = themeDisplay.getDoAsGroupId();
 
-String ckEditorConfigFileName = ParamUtil.getString(request, "ckEditorConfigFileName", "ckconfig.jsp");
+String ckEditorConfigFileName = HtmlUtil.escapeJS(ParamUtil.getString(request, "ckEditorConfigFileName", "ckconfig.jsp"));
 
 boolean useCustomDataProcessor = false;
 
@@ -142,7 +142,7 @@ String toolbarSet = (String)request.getAttribute("liferay-ui:input-editor:toolba
 	(function() {
 		function setData() {
 			<c:if test="<%= Validator.isNotNull(initMethod) %>">
-				ckEditor.setData(<%= HtmlUtil.escape(namespace + initMethod) %>());
+				ckEditor.setData(<%= HtmlUtil.escapeJS(namespace + initMethod) %>());
 			</c:if>
 		}
 
@@ -169,7 +169,7 @@ String toolbarSet = (String)request.getAttribute("liferay-ui:input-editor:toolba
 				customConfig: '<%= PortalUtil.getPathContext() %>/html/js/editor/ckeditor/<%= ckEditorConfigFileName %>?p_l_id=<%= plid %>&p_p_id=<%= HttpUtil.encodeURL(portletId) %>&p_main_path=<%= HttpUtil.encodeURL(mainPath) %>&doAsUserId=<%= HttpUtil.encodeURL(doAsUserId) %>&doAsGroupId=<%= HttpUtil.encodeURL(String.valueOf(doAsGroupId)) %>&cssPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeCss()) %>&cssClasses=<%= HttpUtil.encodeURL(cssClasses) %>&imagesPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeImages()) %>&languageId=<%= HttpUtil.encodeURL(LocaleUtil.toLanguageId(locale)) %><%= configParams %>',
 				filebrowserBrowseUrl: '<%= PortalUtil.getPathContext() %>/html/js/editor/ckeditor/editor/filemanager/browser/liferay/browser.html?Connector=<%= connectorURL %><%= fileBrowserParams %>',
 				filebrowserUploadUrl: null,
-				toolbar: '<%= TextFormatter.format(HtmlUtil.escape(toolbarSet), TextFormatter.M) %>'
+				toolbar: '<%= TextFormatter.format(HtmlUtil.escapeJS(toolbarSet), TextFormatter.M) %>'
 			}
 		);