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

2013-01-23 Sergio Martin <sergio.martin@artica.es> 

* 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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-01-23 18:44:07 +00:00
parent 50489ed0e6
commit c8bba62545
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-01-23 Sergio Martin <sergio.martin@artica.es>
* 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 <rnovoa@artica.es>
* include/help/en/help_alert_macros.php,

2
pandora_console/godmode/modules/manage_network_components.php
View File

@ -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');

2
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -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);
}
}

8
pandora_console/godmode/users/configure_user.php
View File

@ -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'];
}

2
pandora_console/include/auth/mysql.php
View File

@ -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));
}