Updated to support macros in Password Change Message

ldchrist · Jan 6, 2016 · 5b13b06 · 5b13b06
1 parent 6ae71cb
commit 5b13b06
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/changepassword.jsp b/src/main/webapp/WEB-INF/jsp/changepassword.jsp
@@ -22,6 +22,7 @@
 
 <!DOCTYPE html>
 <%@ page import="password.pwm.bean.PasswordStatus" %>
+<%@ page import="password.pwm.util.macro.MacroMachine" %>
 <%@ page language="java" session="true" isThreadSafe="true" contentType="text/html" %>
 <%@ taglib uri="pwm" prefix="pwm" %>
 <% final PwmRequest changepassword_pwmRequest = PwmRequest.forRequest(request,response); %>
@@ -43,9 +44,12 @@
                 <pwm:DisplayPasswordRequirements separator="</li>" prepend="<li>"/>
             </ul>
         </div>
-        <% final String passwordPolicyChangeMessage = changepassword_pwmRequest.getPwmSession().getUserInfoBean().getPasswordPolicy().getRuleHelper().getChangeMessage(); %>
+        <%
+            final String passwordPolicyChangeMessage = changepassword_pwmRequest.getPwmSession().getUserInfoBean().getPasswordPolicy().getRuleHelper().getChangeMessage();
+            MacroMachine macroMachine = JspUtility.getPwmSession(pageContext).getSessionManager().getMacroMachine(ContextManager.getPwmApplication(session));
+        %>
         <% if (passwordPolicyChangeMessage.length() > 1) { %>
-        <p><%= passwordPolicyChangeMessage %></p>
+        <p><%= macroMachine.expandMacros(passwordPolicyChangeMessage) %></p>
         <% } %>
         <br/>
         <%@ include file="fragment/message.jsp" %>