diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5ce1261b20..b070863f18 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-01-23 Sergio Martin + + * include/auth/mysql.php: Fixed update of the last password + change when edit a user in the classic way + + * godmode/users/configure_user.php + godmode/modules/manage_network_components_form_common.php + godmode/modules/manage_network_components.php: Fix wizard + level and metaconsole access default values when charge to + keep data of items created with metaconsole from the standard + console + 2013-01-23 Ramon Novoa * include/help/en/help_alert_macros.php, diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 00696c2cfb..daddc52ab4 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -84,7 +84,7 @@ $history_data = (bool) get_parameter ('history_data'); $post_process = (float) get_parameter('post_process'); $unit = (string) get_parameter('unit'); $id = (int) get_parameter ('id'); -$wizard_level = get_parameter ('wizard_level'); +$wizard_level = get_parameter ('wizard_level', 'nowizard'); $critical_instructions = (string) get_parameter('critical_instructions'); $warning_instructions = (string) get_parameter('warning_instructions'); $unknown_instructions = (string) get_parameter('unknown_instructions'); diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index 9b51b9de13..ed00821cb5 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -60,7 +60,7 @@ if(enterprise_installed()) { } else { $table->data[0][2] = ''; - $table->data[0][3] = html_print_input_hidden('wizard_level', 'nowizard', true); + $table->data[0][3] = html_print_input_hidden('wizard_level', $wizard_level, true); } } diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 4e655bd09f..eee447f7da 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -151,7 +151,9 @@ if ($create_user) { if (enterprise_installed()) { $values['force_change_pass'] = 1; $values['last_pass_change'] = date ("Y/m/d H:i:s", get_system_time()); - $values['metaconsole_access'] = get_parameter ('metaconsole_access'); + if(defined('METACONSOLE')) { + $values['metaconsole_access'] = get_parameter ('metaconsole_access', 'basic'); + } } $values["not_login"] = (bool)get_parameter ('not_login', false); @@ -244,7 +246,7 @@ if ($update_user) { $values['block_size'] = get_parameter ('block_size', $config["block_size"]); $values['flash_chart'] = get_parameter ('flash_charts', $config["flash_charts"]); - if(enterprise_installed()) { + if(enterprise_installed() && defined('METACONSOLE')) { $values['metaconsole_access'] = get_parameter ('metaconsole_access'); } $values["not_login"] = (bool)get_parameter ('not_login', false); @@ -297,7 +299,7 @@ if ($update_user) { $info .= ' Skin: ' . $values['id_skin']; } - if(enterprise_installed()) { + if(enterprise_installed() && defined('METACONSOLE')) { $info .= ' Wizard access: ' . $values['metaconsole_access']; } diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index 86f7356b5b..ea7f3d90af 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -436,7 +436,7 @@ function delete_user ($id_user) { */ function update_user_password ($user, $password_new) { return db_process_sql_update ('tusuario', - array ('password' => md5 ($password_new)), + array ('password' => md5 ($password_new), 'last_pass_change' => date ("Y/m/d H:i:s", get_system_time())), array ('id_user' => $user)); }