fix broken recaptcha
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/459163b8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/459163b8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/459163b8 Branch: refs/heads/expose-reindex Commit: 459163b8ddb4b80ebb43273a8646ee9c8a6fe2bd Parents: be2f69c Author: Mike Dunker <mdun...@google.com> Authored: Wed Aug 9 18:39:23 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Thu Aug 17 09:47:40 2017 -0700 ---------------------------------------------------------------------- .../rest/applications/ApplicationResource/authorize_form.jsp | 2 +- .../rest/applications/users/UserResource/resetpw_email_form.jsp | 4 ++-- .../rest/applications/users/UserResource/resetpw_set_form.jsp | 2 +- .../rest/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 +- .../rest/management/users/UsersResource/resetpw_email_form.jsp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp ---------------------------------------------------------------------- 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 0079bcf..ed934a7 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> + <c:if test="${!empty it.errorMsg}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> <form class="dialog-form" action="" method="post"> <input type="hidden" name="response_type" value="${fn:escapeXml(it.responseType)}"> <input type="hidden" name="client_id" value="${fn:escapeXml(it.clientId)}"> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp ---------------------------------------------------------------------- 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 59026bf..5230ea7 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. </head> <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"> + <c:if test="${!empty it.errorMsg}"> <div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div> </c:if> <form class="dialog-form" action="" method="post"> @@ -37,7 +37,7 @@ limitations under the License. <c:out value="${it.user.email}" escapeXml="true" /> </p> <p id="human-proof"></p> - ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml} <p class="buttons"> <input type="submit" value="submit" /> </p> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp ---------------------------------------------------------------------- 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 19b6528..c0203ce 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> + <c:if test="${!empty it.errorMsg}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> <form class="dialog-form" action="" method="post"> <input type="hidden" name="token" value="${fn:escapeXml(it.token)}"> <fieldset> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp ---------------------------------------------------------------------- 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 f86240f..01dfc57 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"> + <c:if test="${!empty it.errorMsg}"> <div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div> </c:if> <form class="dialog-form" action="" method="post"> @@ -42,7 +42,7 @@ limitations under the License. <input class="text_field" id="email" name="email" type="text" /> </p> <p id="human-proof"></p> - ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml} <p class="buttons"> <button type="submit">Submit</button> </p> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp ---------------------------------------------------------------------- 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 0079bcf..ed934a7 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> + <c:if test="${!empty it.errorMsg}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> <form class="dialog-form" action="" method="post"> <input type="hidden" name="response_type" value="${fn:escapeXml(it.responseType)}"> <input type="hidden" name="client_id" value="${fn:escapeXml(it.clientId)}"> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp ---------------------------------------------------------------------- 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 c9f8309..6341d60 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. </head> <body> <div class="dialog-area password-reset-form"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"> + <c:if test="${!empty it.errorMsg}"> <div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div> </c:if> <form class="dialog-form" action="" method="post"> @@ -37,7 +37,7 @@ limitations under the License. <c:out value="${it.user.email}" escapeXml="true" /> </p> <p id="human-proof"></p> - ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml} <p class="buttons"> <input type="submit" value="submit" /> </p> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp ---------------------------------------------------------------------- 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 60384c4..6334466 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escapeXml(it.errorMsg)}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> + <c:if test="${!empty it.errorMsg}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> <form class="dialog-form" action="" method="post"> <input type="hidden" name="token" value="${fn:escapeXml(it.token)}"> <fieldset> http://git-wip-us.apache.org/repos/asf/usergrid/blob/459163b8/stack/rest/src/main/webapp/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp ---------------------------------------------------------------------- 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 8b15cd4..f8cf496 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. <body> <div class="dialog-area"> - <c:if test="${!empty fn:escnapeXml(it.errorMsg)}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> + <c:if test="${!empty it.errorMsg}"><div class="dialog-form-message">${fn:escapeXml(it.errorMsg)}</div></c:if> <form class="dialog-form" action="" method="post"> <fieldset> <p> @@ -38,7 +38,7 @@ limitations under the License. <input class="text_field" id="email" name="email" type="text" /> </p> <p id="human-proof"></p> - ${fn:escapeXml(it.reCaptchaHtml)} + ${it.reCaptchaHtml} <p class="buttons"> <button type="submit">Submit</button> </p>
