From d42dc2f701415a6e73589032553105fe6169a1a2 Mon Sep 17 00:00:00 2001 From: Mike Dunker Date: Wed, 9 Aug 2017 18:39:23 -0700 Subject: [PATCH] fix broken recaptcha --- .../rest/applications/ApplicationResource/authorize_form.jsp | 2 +- .../applications/users/UserResource/resetpw_email_form.jsp | 4 ++-- .../rest/applications/users/UserResource/resetpw_set_form.jsp | 2 +- .../applications/users/UsersResource/resetpw_email_form.jsp | 4 ++-- .../rest/management/ManagementResource/authorize_form.jsp | 2 +- .../rest/management/users/UserResource/resetpw_email_form.jsp | 4 ++-- .../rest/management/users/UserResource/resetpw_set_form.jsp | 2 +- .../management/users/UsersResource/resetpw_email_form.jsp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp index 0079bcf0a6..ed934a72d6 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp @@ -29,7 +29,7 @@ limitations under the License.
-
${fn:escapeXml(it.errorMsg)}
 +
${fn:escapeXml(it.errorMsg)}
diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp index 59026bf0d8..5230ea7381 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp @@ -27,7 +27,7 @@ limitations under the License.
- +
${fn:escapeXml(it.errorMsg)}
 @@ -37,7 +37,7 @@ limitations under the License.

- ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml}

diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp index 19b6528f4a..c0203ce239 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp @@ -31,7 +31,7 @@ limitations under the License.
-
${fn:escapeXml(it.errorMsg)}
 +
${fn:escapeXml(it.errorMsg)}
diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp index f86240f2f5..01dfc5729b 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp @@ -28,7 +28,7 @@ limitations under the License.
- +
${fn:escapeXml(it.errorMsg)}
 @@ -42,7 +42,7 @@ limitations under the License.

- ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml}

diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp index 0079bcf0a6..ed934a72d6 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp @@ -29,7 +29,7 @@ limitations under the License.
-
${fn:escapeXml(it.errorMsg)}
 +
${fn:escapeXml(it.errorMsg)}
 diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp index c9f8309973..6341d601d6 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp @@ -27,7 +27,7 @@ limitations under the License.
- +
${fn:escapeXml(it.errorMsg)}
 @@ -37,7 +37,7 @@ limitations under the License.

- ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml}

diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp index 60384c43ff..63344665db 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp @@ -30,7 +30,7 @@ limitations under the License.
-
${fn:escapeXml(it.errorMsg)}
 +
${fn:escapeXml(it.errorMsg)}
diff --git a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp index 8b15cd436d..f8cf496256 100644 --- a/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp +++ b/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp @@ -27,7 +27,7 @@ limitations under the License.
-
${fn:escapeXml(it.errorMsg)}
 +
${fn:escapeXml(it.errorMsg)}

@@ -38,7 +38,7 @@ limitations under the License.

- ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml}