tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-05-25 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/setup/setup_auth.php
	include/functions_config.php: Removed user and password from LDAP setup.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2011-05-25 10:10:40 +00:00
parent 3afea3af24
commit 10b1e704da
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup_auth.php
include/functions_config.php: Removed user and password from LDAP setup.
2011-05-25 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/ver_agente.php

8
pandora_console/godmode/setup/setup_auth.php
View File

@ -74,19 +74,15 @@ $table->data[9][0] = __('Base DN');
$table->data[9][1] = html_print_input_text ('ldap_base_dn', $config['ldap_base_dn'], '', 60, 100, true);
$table->data[10][0] = __('Login attribute');
$table->data[10][1] = html_print_input_text ('ldap_login_attr', $config['ldap_login_attr'], '', 60, 100, true);
$table->data[11][0] = __('Username');
$table->data[11][1] = html_print_input_text ('ldap_admin_dn', $config['ldap_admin_dn'], '', 30, 100, true);
$table->data[12][0] = __('Password');
$table->data[12][1] = html_print_input_password ('ldap_admin_pwd', $config['ldap_admin_pwd'], '', 30, 100, true);
// Hide LDAP configuration options
for ($i = 5; $i <= 12; $i++) {
for ($i = 5; $i <= 10; $i++) {
$table->rowstyle[$i] = $config['auth'] == 'ldap' ? '' : 'display: none;';
$table->rowclass[$i] = 'ldap';
}
// Add enterprise authentication options
enterprise_hook ('add_enterprise_auth_options', array (&$table, 13));
enterprise_hook ('add_enterprise_auth_options', array (&$table, 11));
echo '<form id="form_setup" method="post">';
html_print_input_hidden ('update_config', 1);

10
pandora_console/include/functions_config.php
View File

@ -204,8 +204,6 @@ function config_update_config () {
config_update_value ('ldap_start_tls', get_parameter ('ldap_start_tls', $config['ldap_start_tls']));
config_update_value ('ldap_base_dn', get_parameter ('ldap_base_dn', $config['ldap_base_dn']));
config_update_value ('ldap_login_attr', get_parameter ('ldap_login_attr', $config['ldap_login_attr']));
config_update_value ('ldap_admin_dn', get_parameter ('ldap_admin_dn', $config['ldap_admin_dn']));
config_update_value ('ldap_admin_pwd', get_parameter ('ldap_admin_pwd', $config['ldap_admin_pwd']));
config_update_value ('ad_server', get_parameter ('ad_server', $config['ad_server']));
config_update_value ('ad_port', get_parameter ('ad_port', $config['ad_port']));
@ -537,14 +535,6 @@ function config_process_config () {
config_update_value ( 'ldap_login_attr', 'uid');
}
if (!isset ($config['ldap_admin_dn'])) {
config_update_value ( 'ldap_admin_dn', '');
}
if (!isset ($config['ldap_admin_pwd'])) {
config_update_value ( 'ldap_admin_pwd', '');
}
if (!isset ($config['ad_server'])) {
config_update_value ( 'ad_server', 'localhost');
}