Skip to content
Snippets Groups Projects
Commit 2eb5c985 authored by John Barclay's avatar John Barclay
Browse files

1. Moved ldap authorization data to its own table to better support...

1.  Moved ldap authorization data to its own table to better support exportables.  Now only ldap authentication and general prefs are stored in variables.
2.  Moved ldap_temp_api into ldap_server.  Essentially ldap_server is now the temporary api.  This is to avoid some confusion people were having on installs.
3. Added a few user warnings and messages.
parent bc3c47a1
No related branches found
No related tags found
No related merge requests found
......@@ -109,7 +109,7 @@ class LdapServer {
}
if (isset($server_record['bindpw']) && $server_record['bindpw'] != '') {
$this->bindpw = $server_record['bindpw'];
$this->bindpw = ldap_api_decrypt($this->bindpw);
$this->bindpw = ldap_servers_decrypt($this->bindpw);
}
}
......
<?php
// $Id$
/**
* LDAP Server Admin Class
*/
......@@ -69,7 +69,7 @@ class LdapServerAdmin extends LdapServer {
$entry[$field_name] = $this->{$property_name};
}
if ($this->bindpw_new) {
$entry['bindpw'] = ldap_api_encrypt($this->bindpw_new);
$entry['bindpw'] = ldap_servers_encrypt($this->bindpw_new);
} elseif ($this->bindpw_clear) {
$entry['bindpw'] = NULL;
}
......@@ -166,7 +166,7 @@ $form['#prefix'] = t($form['#prefix']);
$form['server']['type'] = array(
'#type' => 'select',
'#options' => ldap_api_temp_ldaps_option_array(),
'#options' => ldap_servers_ldaps_option_array(),
'#title' => t('LDAP Server Type'),
'#default_value' => $this->type,
'#description' => t('This field is informative. It\'s purpose is to assist with default values and give validation warnings.'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment