Skip to content

O
Openfire
Commit 8ec8450a authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Testing is now working. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5608 b35dd754-fafc-0310-a699-88a17e54d16e
parent 98b801f3
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 16 deletions
src/web/WEB-INF/decorators.xml
View file @ 8ec8450a
......@@ -9,6 +9,7 @@
<decorator name="none"/>
<excludes>
<pattern>/setup/setup-completed.jsp*</pattern>
<pattern>/setup/setup-ldap-server_test.jsp*</pattern>
<pattern>/login.jsp*</pattern>
<pattern>/plugin-icon.jsp*</pattern>
<pattern>/js/jscalendar/i18n.jsp*</pattern>
......
src/web/setup/setup-ldap-server.jsp
View file @ 8ec8450a
......@@ -80,15 +80,12 @@
Boolean.toString(connectionPoolEnabled));
settings.put("ldap.sslEnabled", Boolean.toString(sslEnabled));
settings.put("ldap.debugEnabled", Boolean.toString(debugEnabled));
settings.put("ldap.autoFollowReferrals",
Boolean.toString(referralsEnabled));
settings.put("ldap.autoFollowReferrals", Boolean.toString(referralsEnabled));
// Always disable connection pooling so that connections aren't left hanging open.
settings.put("ldap.connectionPoolEnabled", "false");
session.setAttribute("ldapSettings", settings);
if (test) {
// Redirect to testing page.
response.sendRedirect("setup-ldap-server_test.jsp");
}
else {
if (save) {
// Save settings and redirect
JiveGlobals.setXMLProperty("ldap.host", host);
JiveGlobals.setXMLProperty("ldap.port", Integer.toString(port));
......@@ -104,8 +101,8 @@
// Redirect to next step.
response.sendRedirect("setup-ldap-user.jsp?serverType=" + serverType);
return;
}
return;
}
}
else {
......@@ -130,7 +127,20 @@
<body>
<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.connection_settings" /></span></h1>
<% if (test) { %>
<a href="setup-ldap-server_test.jsp" id="lbmessage" title="Test" style="display:none;"></a>
<script type="text/javascript">
function loadMsg() {
var lb = new lightbox(document.getElementById('lbmessage'));
lb.activate();
}
setTimeout('loadMsg()', 250);
</script>
<% } %>
<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.connection_settings" /></span></h1>
<!-- BEGIN jive-contentBox_stepbar -->
<div id="jive-contentBox_stepbar">
......@@ -188,11 +198,11 @@
</tr>
<tr>
<td align="right"><fmt:message key="setup.ldap.server.admindn" />:</td>
<td colspan="3"><input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="150" value="<%= adminDN!=null?adminDN:""%>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></span></td>
<td colspan="3"><input type="text" name="admindn" id="jiveLDAPadmindn" size="40" maxlength="150" value="<%= adminDN!=null?adminDN:""%>"> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.admindn_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></span></td>
</tr>
<tr>
<td align="right"><fmt:message key="setup.ldap.server.password" />:</td>
<td colspan="3"><input type="password" name="adminpwd" id="jiveLDAPadminpwd" size="22" maxlength="30" value="<%= adminPassword!=null?adminPassword:""%>"><span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.password_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td>
<td colspan="3"><input type="password" name="adminpwd" id="jiveLDAPadminpwd" size="22" maxlength="30" value="<%= adminPassword!=null?adminPassword:""%>"> <span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.ldap.server.password_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', 8000);"></span></td>
</tr>
</table>
</div>
......@@ -286,12 +296,10 @@
<!-- BEGIN right-aligned buttons -->
<div align="right">
<%--<a href="setup-ldap-server_test.jsp" class="lbOn" id="jive-setup-test2">
<img src="../images/setup_btn_gearplay.gif" alt="" width="14" height="14" border="0">
<fmt:message key="setup.ldap.test" />
</a>--%>
<input type="Submit" name="test" value="<fmt:message key="setup.ldap.test" />" id="jive-setup-test" border="0">
<input type="Submit" name="save" value="<fmt:message key="setup.ldap.continue" />" id="jive-setup-save" border="0">
<input type="Submit" name="save" value="<fmt:message key="setup.ldap.continue" />" id="jive-setup-save" border="0">
</div>
<!-- END right-aligned buttons -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023