9 年之前 · bfa5a3b4b2
--- a/pom.xml
+++ b/pom.xml
@@ -303,12 +303,12 @@
 
				         <dependency>
			
 
				             <groupId>com.sun.mail</groupId>
			
 
				             <artifactId>javax.mail</artifactId>
			
 
				-            <version>1.5.2</version>
			
 
				+            <version>1.5.5</version>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				             <groupId>org.apache.httpcomponents</groupId>
			
 
				             <artifactId>httpclient</artifactId>
			
 
				-            <version>4.5.1</version>
			
 
				+            <version>4.5.2</version>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				             <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
			
@@ -348,7 +348,7 @@
 
				         <dependency>
			
 
				             <groupId>org.jasig.cas.client</groupId>
			
 
				             <artifactId>cas-client-core</artifactId>
			
 
				-            <version>3.2.0</version>
			
 
				+            <version>3.4.1</version>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				             <groupId>org.mapdb</groupId>
			
@@ -363,12 +363,12 @@
 
				         <dependency>
			
 
				             <groupId>org.bouncycastle</groupId>
			
 
				             <artifactId>bcprov-jdk15on</artifactId>
			
 
				-            <version>1.53</version>
			
 
				+            <version>1.54</version>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				             <groupId>org.bouncycastle</groupId>
			
 
				             <artifactId>bcpkix-jdk15on</artifactId>
			
 
				-            <version>1.53</version>
			
 
				+            <version>1.54</version>
			
 
				         </dependency>
			
 
				         <dependency>
			
 
				             <groupId>javax.xml</groupId>
			
@@ -398,7 +398,7 @@
 
				         <dependency>
			
 
				             <groupId>net.iharder</groupId>
			
 
				             <artifactId>base64</artifactId>
			
 
				-            <version>2.3.8</version>
			
 
				+            <version>2.3.9</version>
			
 
				         </dependency>
			
 
				 
			
 
				 
			
--- a/src/main/webapp/WEB-INF/jsp/helpdesk-detail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/helpdesk-detail.jsp
@@ -579,7 +579,7 @@
 
				                         </button>
			
 
				                         <% } %>
			
 
				                         <% } %>
			
 
				-                        <% if ((boolean)JspUtility.getPwmRequest(pageContext).getAttribute(PwmRequest.Attribute.HelpdeskVerificationEnabled) == true) { %>
			
 
				+                        <% if ((Boolean)JspUtility.getPwmRequest(pageContext).getAttribute(PwmRequest.Attribute.HelpdeskVerificationEnabled) == true) { %>
			
 
				                         <button id="sendTokenButton" class="helpdesk-detail-btn btn">
			
 
				                             <pwm:if test="<%=PwmIfTest.showIcons%>"><span class="btn-icon pwm-icon pwm-icon-mobile-phone"></span></pwm:if>
			
 
				                             <pwm:display key="Button_Verify"/>
			
--- a/src/main/webapp/WEB-INF/jsp/helpdesk.jsp
+++ b/src/main/webapp/WEB-INF/jsp/helpdesk.jsp
@@ -49,7 +49,7 @@
 
				                             <span style="color: #ffcd59;" class="pwm-icon pwm-icon-lg pwm-icon-exclamation-circle"></span>
			
 
				                         </div>
			
 
				                     </td>
			
 
				-                    <% if ((boolean)JspUtility.getPwmRequest(pageContext).getAttribute(PwmRequest.Attribute.HelpdeskVerificationEnabled) == true) { %>
			
 
				+                    <% if ((Boolean)JspUtility.getPwmRequest(pageContext).getAttribute(PwmRequest.Attribute.HelpdeskVerificationEnabled) == true) { %>
			
 
				                     <td style="width: 45px">
			
 
				                         <button class="btn" id="button-show-current-verifications">Verifications</button>
			
 
				                     </td>
			
--- a/src/main/webapp/private/config/index.jsp
+++ b/src/main/webapp/private/config/index.jsp
@@ -27,14 +27,14 @@
 
				 <html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
			
 
				 <jsp:include page="/WEB-INF/jsp/fragment/header.jsp"/>
			
 
				 <body>
			
 
				-<meta http-equiv="refresh" content="0;url=<pwm:context/><pwm:url url="/private/config/ConfigManager"/>"/>
			
 
				+<meta http-equiv="refresh" content="0;url=<pwm:context/><pwm:url url="/private/config/manager"/>"/>
			
 
				 <div id="wrapper">
			
 
				     <jsp:include page="/WEB-INF/jsp/fragment/header-body.jsp">
			
 
				         <jsp:param name="pwm.PageName" value="Configuration"/>
			
 
				     </jsp:include>
			
 
				     <div id="content">
			
 
				         <div id="centerbody">
			
 
				-            <pwm:display key="Display_PleaseWait"/> <a href="<pwm:context/><pwm:url url="/private/config/ConfigManage"/>"><pwm:display bundle="Admin" key="MenuItem_ConfigManager"/></a>
			
 
				+            <pwm:display key="Display_PleaseWait"/> <a href="<pwm:context/><pwm:url url="/private/config/manager"/>"><pwm:display bundle="Admin" key="MenuItem_ConfigManager"/></a>
			
 
				         </div>
			
 
				     </div>
			
 
				     <br class="clear"/>
			
--- a/src/main/webapp/public/resources/js/configeditor.js
+++ b/src/main/webapp/public/resources/js/configeditor.js
@@ -311,7 +311,7 @@ PWM_CFGEDIT.initConfigEditor = function(nextFunction) {
 
				             text:PWM_CONFIG.showString('Display_ConfigOpenInfo'),
			
 
				             loadFunction:function(){
			
 
				                 PWM_MAIN.addEventHandler('link-configManager','click',function(){
			
 
				-                    PWM_MAIN.goto('/private/config/ConfigManager');
			
 
				+                    PWM_MAIN.goto('/private/config/manager');
			
 
				                 });
			
 
				             }
			
 
				         });
			
@@ -587,13 +587,13 @@ PWM_CFGEDIT.cancelEditing = function() {
 
				                         function () {
			
 
				                             PWM_MAIN.showWaitDialog({loadFunction: function () {
			
 
				                                 PWM_MAIN.ajaxRequest('ConfigEditor?processAction=cancelEditing',function(){
			
 
				-                                    PWM_MAIN.goto('ConfigManager', {addFormID: true});
			
 
				+                                    PWM_MAIN.goto('manager', {addFormID: true});
			
 
				                                 });
			
 
				                             }});
			
 
				                         }
			
 
				                     });
			
 
				                 } else {
			
 
				-                    PWM_MAIN.goto('ConfigManager', {addFormID: true});
			
 
				+                    PWM_MAIN.goto('manager', {addFormID: true});
			
 
				                 }
			
 
				             }
			
 
				         };