[JM-1230] LDAP profile changes are now keeping previous settings.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9725 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/setup/ldap-group.jspf

@@ -144,7 +144,7 @@
     <% } %>
 
     <% if (initialSetup) { %>
-	<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.group_mapping" /></h1>
+	<h1><fmt:message key="setup.ldap.profile" />: <span><fmt:message key="setup.ldap.group_mapping" /></span></h1>
     <% } %>
 
 	<!-- BEGIN jive-contentBox_stepbar -->

src/web/setup/ldap-user.jspf

@@ -40,7 +40,11 @@
         defaultUsernameField = JiveGlobals.getXMLProperty("ldap.usernameField");
         defaultSearchFields = JiveGlobals.getXMLProperty("ldap.searchFields");
         defaultSearchFilter = JiveGlobals.getXMLProperty("ldap.searchFilter");
-        if (serverType.equals("activedirectory")) {
+        vcardBean = new LdapUserProfile();
+        if (vcardBean.loadFromProperties()) {
+            // Loaded from stored settings, no need to do anything else.  
+        }
+        else if (serverType.equals("activedirectory")) {
             if (!vcardBean.loadFromProperties()) {
                 // Initialize vCard mappings
                 vcardBean.initForActiveDirectory();
@@ -52,7 +56,8 @@
             if (defaultSearchFilter == null) {
                 defaultSearchFilter = "(objectClass=organizationalPerson)";
             }
-        } else {
+        }
+        else {
             if (!vcardBean.loadFromProperties()) {
                 // Initialize vCard mappings
                 vcardBean.initForOpenLDAP();