Author: sshyrkov Date: Tue Oct 16 11:39:06 2007 New Revision: 18873 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18873&repname= =3Djahia Log: JAHIA-2496: Root context: stats module in the Admin Center does not work an= y more =
http://www.jahia.net/jira/browse/JAHIA-2496 Resolution: fixed JavaScript escaping issue Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display.jsp branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display_summary.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra= tion/statistics_display.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/administration/statistics_display.jsp&rev= =3D18873&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display.jsp Tue Oct 16 11:39:06 2007 @@ -25,6 +25,7 @@ <[EMAIL PROTECTED] import =3D "org.jahia.utils.*"%> <[EMAIL PROTECTED] import =3D "java.util.*" %> <[EMAIL PROTECTED] import =3D "java.text.*" %> +<[EMAIL PROTECTED] import =3D "org.apache.commons.lang.StringEscapeUtils" %> = <jsp:directive.page contentType=3D"text/html; charset=3DUTF-8" /> = @@ -91,22 +92,22 @@ var month =3D document.mainForm.month.value; var day =3D document.mainForm.day.value; if (year !=3D "" && (! isNumeric(year) || year<1) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.year.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.year.label", jParams, jParams.getLocale()))%>'); return false; } if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.month.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.month.label", jParams, jParams.getLocale()))%>'); return false; } if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.day.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.day.label", jParams, jParams.getLocale()))%>'); return false; } if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year= ,month,day)) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.date.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.date.label", jParams, jParams.getLocale()))%>'); return false; } Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra= tion/statistics_display_summary.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/administration/statistics_display_summary= .jsp&rev=3D18873&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display_summary.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s= tatistics_display_summary.jsp Tue Oct 16 11:39:06 2007 @@ -26,6 +26,7 @@ <[EMAIL PROTECTED] import =3D "java.util.*" %> <[EMAIL PROTECTED] import =3D "java.text.*" %> <[EMAIL PROTECTED] import =3D "java.util.HashMap" %> +<[EMAIL PROTECTED] import =3D "org.apache.commons.lang.StringEscapeUtils" %> = <jsp:directive.page contentType=3D"text/html; charset=3DUTF-8" /> = @@ -85,22 +86,22 @@ var month =3D document.mainForm.month.value; var day =3D document.mainForm.day.value; if (year !=3D "" && (! isNumeric(year) || year<1) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.year.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.year.label", jParams, jParams.getLocale()))%>'); return false; } if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.month.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.month.label", jParams, jParams.getLocale()))%>'); return false; } if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.day.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.day.label", jParams, jParams.getLocale()))%>'); return false; } if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year= ,month,day)) { - alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc= e("org.jahia.admin.statistics.error.date.label", + alert('<%=3DStringEscapeUtils.escapeJavaScript(JahiaResourceBundle.g= etAdminResource("org.jahia.admin.statistics.error.date.label", jParams, jParams.getLocale()))%>'); return false; } _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
